diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U index d6bb5b1805..660ba748a4 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/U @@ -123,4 +123,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water index b5603344c4..7c4635364a 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/alpha.water @@ -56,4 +56,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh index d2d6335aeb..7ea42a8bcf 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/0.orig/p_rgh @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g index 2ad198d791..43118d7762 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties index 3f7255db5e..035805d6e9 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object kinematicCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties index 8499d16644..b9b70921b6 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/turbulenceProperties @@ -10,17 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { RASModel kEpsilon; + turbulence on; + printCoeffs on; } + + // ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict index 706c1a4570..c3c2a2476f 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 1.0; maxDeltaT 0.05; - functions { minMax diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict index 93d668053a..c818232b37 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/createPatchDict @@ -37,4 +37,5 @@ patches } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes index 64e9fd4cb1..3c1520aa67 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution index fcb1b9d071..59871a6d0d 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -92,4 +91,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict index 724cd8843f..a55abd4346 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict index 21d8127b58..463b49e37b 100644 --- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict +++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,4 +33,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U index 55ac15224d..76bac0f29e 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/U @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour index ae5e042974..e5cdee1276 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/alpha.vapour @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p index 8da5d6c17a..677b4fe31a 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho index 01307c981c..2430792461 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/0.orig/rho @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun index bb0b5370dd..1133f25d20 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/Allrun @@ -24,7 +24,9 @@ refineMeshByCellSet() restore0Dir runApplication blockMesh + refineMeshByCellSet 1 2 3 + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties index 1fe5833cc3..fb555488e1 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/thermodynamicProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties index d48547da66..818e450956 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties index e78377b862..ee92925b72 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict index 6f92f85be6..db84b6156d 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/blockMeshDict @@ -134,4 +134,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict index 4503e17924..4e5dca5df2 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes index 32ae3a8f63..c9fd53133d 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,6 +27,7 @@ interpolationSchemes divSchemes { default none; + div(phi,rho) Gauss vanLeer; div(rhoPhi,U) Gauss LUST grad(U); div(phi,k) Gauss LUST grad(k); @@ -49,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution index bbb0ffc245..428b34bf32 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict index 02c398db23..be9fb70811 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 index 2e80e36f41..1ebc06e757 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 index f73afa1d5b..60660a9f09 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 index 040addae2b..a67aa89b52 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/topoSetDict.3 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U index ab3d8c0247..33ddfe4aa8 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour index 1d5e79a234..eb645f9b38 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k index 206b118393..0338ffae20 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p index f82ed3c1a7..2f83501506 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho index 62bd47723e..adf66b766c 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun index 08d6265bc9..077dd122bf 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun @@ -24,13 +24,16 @@ refineMeshByCellSet() restore0Dir runApplication blockMesh + refineMeshByCellSet 1 2 3 #echo "mapping fields from 2D throttle case" #runApplication mapFields ../throttle -sourceTime latestTime runApplication decomposePar + runParallel $(getApplication) + runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties index 1fe5833cc3..fb555488e1 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/thermodynamicProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties index 05038dab58..818e450956 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,4 +30,5 @@ vapour rho 0.14; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties index e78377b862..ee92925b72 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict index dc95a7f184..a55a064404 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/blockMeshDict @@ -134,4 +134,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict index a9e1f78dd9..f0da3515b7 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict index a34c4a69f0..d96083400d 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/decomposeParDict @@ -23,9 +23,5 @@ coeffs n (2 2 1); } -distributed no; - -roots ( ); - // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes index e0f3f18fe0..c9fd53133d 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution index 19df71b9fc..841fd8077e 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict index 8600f7ee4c..6b04f02d83 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 index 2e80e36f41..1ebc06e757 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 index f73afa1d5b..60660a9f09 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 index 040addae2b..a67aa89b52 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/topoSetDict.3 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U index f7baa3cafd..6dd8873a43 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/U @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour index ae5e042974..e5cdee1276 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/alpha.vapour @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p index 8da5d6c17a..677b4fe31a 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho index 01307c981c..2430792461 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/0.orig/rho @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties index f2100c3b66..fb555488e1 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/thermodynamicProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermodynamicProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,4 +26,5 @@ pSat 4500; rhoMin 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties index 05038dab58..818e450956 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,4 +30,5 @@ vapour rho 0.14; } + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties index 4bdf335073..a8013f99c8 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict index 6f92f85be6..db84b6156d 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/blockMeshDict @@ -134,4 +134,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict index cda1fa9028..638e154d5b 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes index 278bd03fac..80337e1ef1 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,6 +27,7 @@ interpolationSchemes divSchemes { default none; + div(phi,rho) Gauss limitedLinear 1; div(rhoPhi,U) Gauss limitedLinearV 1; div(phi,omega) Gauss limitedLinear 1; @@ -52,7 +52,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution index bbb0ffc245..428b34bf32 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict index 02c398db23..be9fb70811 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 index 2e80e36f41..1ebc06e757 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 index f73afa1d5b..60660a9f09 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 index 040addae2b..a67aa89b52 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/topoSetDict.3 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict.3; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T index 5bd7361221..b5aec6caac 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/T @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U index f4400b92b9..8aae30e0ed 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/U @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water index be5471701c..aca52b40d6 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/alpha.water @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p index f7e1d4d466..67df9418b4 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh index 1f7ba75814..ac6377bf32 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/0.orig/p_rgh @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict index 5c1363c36f..a79cc4085d 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties index cbbd439e65..49fa457e21 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); pMin 1000; sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water index 3318143585..1ec6586814 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties index 17cc291833..14191a2360 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict index 93df557d7a..8275725845 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict index df13f4e670..d569ffffc0 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 3 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes index 9818cdc220..caba7226a7 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,4 +56,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution index f5a0898f94..89490af661 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun index 7bd9a17145..9406f6ea50 100755 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/Allrun @@ -4,6 +4,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + runApplication topoSet # remove empty patches diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict index ff75ba67a1..74d9d099b2 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/dynamicMeshDict @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -105,4 +104,5 @@ displacementLayeredMotionCoeffs } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g index eb9ef76472..d549aafe23 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties index 63ba13e090..fc2860995b 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin pMin [1 -1 -2 0 0 0 0] 1000; +pMin 1000; + +sigma 0.07; -sigma sigma [1 0 -2 0 0 0 0] 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water index 91721783b2..5d99e3e225 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties index c2f778d436..1c5c09e87d 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,4 +30,5 @@ air rho 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sphereDrop/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T index 49509d27ef..23085b1626 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T @@ -34,4 +34,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid index 8c1cfff2c7..833770f5d3 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid @@ -34,4 +34,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p index e2eee474df..49dddf94f2 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p @@ -35,4 +35,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh index c325260cc7..c5942f5df6 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh @@ -35,4 +35,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun index 316fb4d9fb..01b0311740 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun @@ -4,11 +4,13 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + runApplication extrudeMesh restore0Dir runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README.md similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README.md diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions index 858312aa9d..e91f727309 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties index 2e80464dfc..821cc40f4f 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (liquid air); +phases (liquid air); -pMin 10000; +pMin 10000; + +sigma 0.0309; -sigma 0.0309; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air index b3b37a1166..d3978c6c74 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid index df77fddda7..dd6d219817 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties index dfec0fcf56..38ab5df9e2 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid index a7800f7a76..a9a9f62b28 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict index 501d37d5dd..552fc1a943 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/blockMeshDict @@ -111,4 +111,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict index 97cae911d8..590c8e86d3 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict index 8cc09850d2..bd262c8f99 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/extrudeMeshDict @@ -33,4 +33,5 @@ flipNormals false; mergeFaces false; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes index b96fb66c7e..de272046d8 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution index 4ee8c5b4bf..c55b40e63a 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict index faabf2cb16..882e325a1c 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T index 0a2e987bc4..8c11db8f3f 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U index c55c20bf7b..0acd7f37ca 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water index f1b4aa5d64..c2b40f30eb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p index 7242894261..6d8fac3490 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh index 4ba2a87bce..b44869f693 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun index b731754818..6f75dcbe9b 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun @@ -4,8 +4,11 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + restore0Dir + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties index 73d356bf27..4f12bd376a 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties @@ -10,19 +10,19 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; sigma { - type constant; - sigma 0.07; + type constant; + sigma 0.07; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water index 476e01ef73..1ec6586814 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,5 +49,4 @@ mixture } - // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict index 726c4fa753..1b1fb8c6d9 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/blockMeshDict @@ -49,4 +49,5 @@ patches ) ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict index 235892e01b..3189e30576 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes index b76be9b0d6..3152139fb4 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,4 +53,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution index 806544b0cd..4fbe6ba118 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict index 6b77dac570..f68e139d7a 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T index 0a2e987bc4..8c11db8f3f 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U index c55c20bf7b..0acd7f37ca 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water index f1b4aa5d64..c2b40f30eb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p index 7242894261..6d8fac3490 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh index 1159752eee..005fa9a14d 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun index 02b2d981f3..ba5c6cd4f0 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun @@ -4,10 +4,15 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + restore0Dir + runApplication setFields + runApplication decomposePar + runParallel $(getApplication) + runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties index 84c2163377..24fab8a8ad 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; + +sigma 0.07; -sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water index f82a05a524..ad5964c997 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict index 567218a756..4497d57f34 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/blockMeshDict @@ -50,4 +50,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict index a0834cb566..60f8aa2812 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes index b76be9b0d6..3152139fb4 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,4 +53,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution index 692726b4d4..3db6dae213 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict index 354a7c2bf5..a6ecdb09c2 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T index 1093da2194..301fac8860 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/T @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U index 0d3b411960..44f612af52 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/U @@ -24,10 +24,12 @@ boundaryField { type noSlip; } + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water index 0ed2df341e..b18c264eca 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/alpha.water @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p index 5b7d50284f..1e2e1a91a9 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh index 3f0751ecd5..8ce700c6a7 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/0.orig/p_rgh @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre index dc32010f00..8402842cd9 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/Allrun.pre @@ -4,7 +4,9 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + restore0Dir + runApplication setFields #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties index 73d356bf27..4f12bd376a 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties @@ -10,19 +10,19 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; sigma { - type constant; - sigma 0.07; + type constant; + sigma 0.07; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water index 99832c235a..1ec6586814 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/thermophysicalProperties.water @@ -10,25 +10,9 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -/* -thermoType -{ - type heRhoThermo; - mixture pureMixture; - properties liquid; - energy sensibleInternalEnergy; -} - -mixture -{ - H2O; -} -*/ - thermoType { @@ -65,5 +49,4 @@ mixture } - // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict index 039d598b54..f407ad124c 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/blockMeshDict @@ -82,4 +82,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict index 6b31f9ba9b..3c1a5e7602 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,11 +27,12 @@ endTime 5; deltaT 0.005; writeControl timeStep; + writeInterval 10; purgeWrite 0; -writeFormat ascii; //binary; +writeFormat ascii; writePrecision 16; @@ -44,10 +44,9 @@ timePrecision 10; runTimeModifiable yes; -//adjustTimeStep yes; maxCo 0.5; maxAlphaCo 0.5; -//maxDeltaT 1; + libs (utilityFunctionObjects); diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict index 89597becbf..7511837b48 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/decomposeParDict @@ -18,4 +18,5 @@ numberOfSubdomains 3; method scotch; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes index b76be9b0d6..3152139fb4 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,4 +53,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution index 806544b0cd..4fbe6ba118 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict index 5707668049..b0c30cd551 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/fluid/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T index 1853f9996a..30ef14e0a5 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/T @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p index 7eac01f2b7..b2b32518c9 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/0/p @@ -29,4 +29,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties index 8f1ab77361..5f4c038aff 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/radiationProperties @@ -5,13 +5,11 @@ | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,4 +18,5 @@ radiation off; radiationModel none; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties index 91f83eb540..c215a804ea 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/constant/thermophysicalProperties @@ -31,22 +31,20 @@ mixture { molWeight 50; } - transport { kappa 80; } - thermodynamics { Hf 0; Cp 450; } - equationOfState { rho 8000; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict index dca7af2941..1921be7e94 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/blockMeshDict @@ -28,7 +28,6 @@ vertices (0 0 0.1) ); - blocks ( hex (0 1 2 3 4 5 6 7) (10 10 1) simpleGrading (1 10 1) @@ -89,4 +88,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict index cc2c81dd0e..096bd8463f 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,11 +27,12 @@ endTime 5; deltaT 0.005; writeControl timeStep; + writeInterval 10; purgeWrite 0; -writeFormat ascii; //binary; +writeFormat ascii; writePrecision 16; @@ -64,4 +64,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict index 2b48e0c1aa..e62a5c9bbd 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/decomposeParDict @@ -18,4 +18,5 @@ numberOfSubdomains 2; method scotch; + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes index 8c93ad122d..9d68469777 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution index 3aeaccb953..168b3ba77a 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/waterCooler/solid/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,4 +30,5 @@ PIMPLE nNonOrthogonalCorrectors 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T index 49509d27ef..23085b1626 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/T @@ -34,4 +34,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U index db516bfd91..07fea9e791 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/U @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volVectorField; - location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid index 8c1cfff2c7..833770f5d3 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/alpha.liquid @@ -34,4 +34,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p index e2eee474df..49dddf94f2 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p @@ -35,4 +35,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh index c325260cc7..c5942f5df6 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/0.orig/p_rgh @@ -35,4 +35,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun index 316fb4d9fb..01b0311740 100755 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/Allrun @@ -4,11 +4,13 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + runApplication extrudeMesh restore0Dir runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README.md similarity index 100% rename from tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README rename to tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/README.md diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions index 858312aa9d..e91f727309 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties index 2e80464dfc..821cc40f4f 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (liquid air); +phases (liquid air); -pMin 10000; +pMin 10000; + +sigma 0.0309; -sigma 0.0309; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air index b3b37a1166..d3978c6c74 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid index df77fddda7..dd6d219817 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties index dfec0fcf56..38ab5df9e2 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid index a7800f7a76..a9a9f62b28 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/constant/turbulenceProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict index 501d37d5dd..552fc1a943 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/blockMeshDict @@ -111,4 +111,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict index 8f80450bf4..d92305d0c2 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict index 8cc09850d2..bd262c8f99 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/extrudeMeshDict @@ -33,4 +33,5 @@ flipNormals false; mergeFaces false; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes index 0fed507ac5..6285469ff7 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution index 5a704b1b32..78287cad4a 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict index faabf2cb16..882e325a1c 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/climbingRod/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T index 0a2e987bc4..8c11db8f3f 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/T @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U index 516e7372bf..0acd7f37ca 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/U @@ -24,10 +24,12 @@ boundaryField { type noSlip; } + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water index f1b4aa5d64..c2b40f30eb 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/alpha.water @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p index 7242894261..6d8fac3490 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh index 4ba2a87bce..b44869f693 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/0.orig/p_rgh @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun index 30fed9690e..d60272f8d1 100755 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/Allrun @@ -4,10 +4,15 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + restore0Dir + runApplication setFields + runApplication setAlphaField + runApplication $(getApplication) + foamSequenceVTKFiles -vtp #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties index 73d356bf27..4f12bd376a 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties @@ -10,19 +10,19 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; sigma { - type constant; - sigma 0.07; + type constant; + sigma 0.07; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water index 99832c235a..1ec6586814 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water @@ -10,25 +10,9 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -/* -thermoType -{ - type heRhoThermo; - mixture pureMixture; - properties liquid; - energy sensibleInternalEnergy; -} - -mixture -{ - H2O; -} -*/ - thermoType { @@ -65,5 +49,4 @@ mixture } - // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict index 726c4fa753..1b1fb8c6d9 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/blockMeshDict @@ -49,4 +49,5 @@ patches ) ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict index b3eba361c4..a349f2ec33 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -75,4 +74,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes index 0ed6499084..5647002db3 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,4 +55,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution index 872f08e63d..02c0fb1f06 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict index 90fded7512..52cae3320c 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setAlphaFieldDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -35,6 +34,7 @@ composedFunction direction (0 0 1); scale -1; } - } + + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict index 6acdee5873..e0bfefcfd3 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge2D/system/setFieldsDict @@ -10,14 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // defaultFieldValues ( -// volScalarFieldValue alpha.water 1 volScalarFieldValue p_rgh 1e5 volScalarFieldValue p 1e5 volScalarFieldValue T 300 @@ -32,20 +30,11 @@ regions fieldValues ( - //volScalarFieldValue alpha.water 0 volScalarFieldValue p_rgh 1e6 volScalarFieldValue p 1e6 volScalarFieldValue T 578 ); } - /* boxToCell - { - box (-10 1 -1) (10 10 1); - fieldValues - ( - volScalarFieldValue alpha.water 0 - ); - }*/ ); diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T index 0a2e987bc4..8c11db8f3f 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/T @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U index 516e7372bf..0acd7f37ca 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/U @@ -24,10 +24,12 @@ boundaryField { type noSlip; } + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water index f1b4aa5d64..c2b40f30eb 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/alpha.water @@ -31,4 +31,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p index 7242894261..6d8fac3490 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh index 1159752eee..005fa9a14d 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/0.orig/p_rgh @@ -32,4 +32,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean index a3ef4042a2..fb1f384730 100755 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allclean @@ -5,6 +5,4 @@ cd "${0%/*}" || exit # Run from this directory cleanCase0 -rm -rf processor* - #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun index 02b2d981f3..ba5c6cd4f0 100755 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/Allrun @@ -4,10 +4,15 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + restore0Dir + runApplication setFields + runApplication decomposePar + runParallel $(getApplication) + runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties index 84c2163377..24fab8a8ad 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties @@ -10,15 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; + +sigma 0.07; -sigma 0.07; // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air index 4e26caef40..3461f00cbb 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water index 3318143585..1ec6586814 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict index 567218a756..4497d57f34 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/blockMeshDict @@ -50,4 +50,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict index 4f00a16cb1..9d58a5fbc5 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict index 0cf712db50..042a24ffd8 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 4 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes index 0ed6499084..5647002db3 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,4 +55,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution index 93fe7bbef8..8a77fe12fe 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict index 354a7c2bf5..a6ecdb09c2 100644 --- a/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterIsoFoam/laminar/depthCharge3D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p index c896ef3868..a5f3704a21 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh index 755fc4733e..aeebc21920 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun index 9134abbfbf..cc36822e88 100755 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties index 31f0ab23ce..d56e844ee6 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water oil mercury air); +phases (water oil mercury air); pMin 10000; diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury index bb3d2e5001..f2c0364550 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil index 7239e53527..7667e21b31 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water index 8aa850cdd7..b2c4a73f39 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict index 835a9bfbf7..e4d379c275 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index 41f3d7b4e8..1e395b550c 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index b3ef93e7e3..987b9fb3ba 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -97,4 +96,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict index 354cada94e..4dcccd460a 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U index 3cede6453c..1abeaee18a 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/U @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge index 01ef357fa6..59e732ac8f 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/alpha.sludge @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon index bc2f6d3552..d5f500a4b8 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/epsilon @@ -61,4 +61,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k index 8acadd0a62..8934ac7a62 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/k @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh index 135599b9e3..617841e640 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/0/p_rgh @@ -56,4 +56,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties index ac07301080..7aa29edd93 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (sludge water); +phases (sludge water); sludge { diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties index 8768fc3944..9a356e87e8 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel buoyantKEpsilon; + RASModel buoyantKEpsilon; turbulence on; + printCoeffs on; buoyantKEpsilonCoeffs @@ -30,4 +30,5 @@ RAS } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict index 0237256382..9b789f79a0 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/blockMeshDict @@ -102,4 +102,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict index fe1114b118..dc875580ae 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes index bedf86254f..09ee79385a 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,4 +53,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution index 1abb9323c7..0fe618cc8f 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge index 49d0bfda07..d8f89c7d40 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/alpha.sludge @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh index 9b420c815b..67bd9687ef 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/0.orig/p_rgh @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties index 43b9d83924..58fd56d294 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 6.2831853; } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g index 72a61dd0aa..28b07d0b87 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 -9.81 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties index ac07301080..7aa29edd93 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (sludge water); +phases (sludge water); sludge { diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties index 8768fc3944..9a356e87e8 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel buoyantKEpsilon; + RASModel buoyantKEpsilon; turbulence on; + printCoeffs on; buoyantKEpsilonCoeffs @@ -30,4 +30,5 @@ RAS } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict index 23416edf2c..0d31a91f52 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes index 5cd9876a42..62b24c8d9b 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,4 +55,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution index 6a7902b221..50343e9aa4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict index e80ff4b1c1..4268bb1969 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U index db5b60941a..41756d80c6 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/U @@ -129,4 +129,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge index 1ab2316428..12276306d4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/alpha.sludge @@ -63,4 +63,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon index 735ef825e2..a7c81595e0 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/epsilon @@ -64,4 +64,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k index 3cb7069fdf..ff1a7c53b4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/k @@ -64,4 +64,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut index ebe57fa30d..ecca4835ed 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/nut @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh index e38402b5c6..d6bd571dd2 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/0.orig/p_rgh @@ -69,4 +69,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun index ad391b25ac..3cd2400ec9 100755 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/Allrun @@ -4,6 +4,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ cp -rf constant/polyMesh.orig constant/polyMesh + restore0Dir runApplication $(getApplication) diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties index befa5d398a..f5e4794c8a 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (sludge water); +phases (sludge water); sludge { @@ -54,4 +53,5 @@ relativeVelocityModel simple; residualAlpha 0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties index 8768fc3944..9a356e87e8 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel buoyantKEpsilon; + RASModel buoyantKEpsilon; turbulence on; + printCoeffs on; buoyantKEpsilonCoeffs @@ -30,4 +30,5 @@ RAS } } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict index e1522aa30b..812b845bab 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ timePrecision 6; runTimeModifiable yes; + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes index 05d0ca00d7..193155b1f6 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,4 +53,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution index 0db0db76b7..9c214b7b7c 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T index cb0dc7a32a..f21a89cc4c 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/T @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U index 106cce5c19..c41ea73601 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas index ba7af22b52..99ef278b58 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.gas @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid index 57aca06c10..6e41c25291 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/alpha.liquid @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p index 4d560ef267..a733a2cb20 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh index 4e2f59b408..42cbaff8e9 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/0.orig/p_rgh @@ -51,4 +51,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun index 9134abbfbf..cc36822e88 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas index 993c4cde2f..14a8b3570b 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/thermophysicalProperties.gas @@ -46,7 +46,7 @@ vapour } thermodynamics { - Hf 0;//-1.338e7; //[J/kg] + Hf 0; Cp 1900; } transport diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties index c6d5f49dc1..a884621163 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/constant/turbulenceProperties @@ -10,18 +10,19 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; + object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { RASModel kEpsilon; turbulence on; + printCoeffs on; } diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict index a63960fed6..1b461a2559 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/blockMeshDict @@ -79,4 +79,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict index a0ec3ef785..b0a8634e44 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,4 +54,5 @@ maxAlphaCo 1.5; maxAlphaDdt 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes index 91de7fba72..51f594b04f 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,4 +63,6 @@ fluxRequired Xvapour.gas; "alpha.*"; } + + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution index b8d923c24d..5afed91e41 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -70,12 +69,9 @@ solvers preconditioner DIC; tolerance 1e-8; relTol 0.01; - nPreSweeps 0; nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict index e0d10ac6d4..0294fbbb98 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/system/setFieldsDict @@ -33,4 +33,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T index 278923c502..c803d45cc7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/T @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U index c0a1da3aed..8491b82e0f 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p index 4d560ef267..a733a2cb20 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh index 5f8f0b96e0..d87d3ffc98 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/0.orig/p_rgh @@ -51,4 +51,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun index 9134abbfbf..cc36822e88 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid index 3a9537484a..6b92f17814 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.liquid @@ -81,4 +81,5 @@ O2 } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury index 3f5fb3d62f..ce79112dc0 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.mercury @@ -71,4 +71,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil index af2d3f6b49..a49ddd7d61 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/thermophysicalProperties.oil @@ -53,4 +53,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties index 46994ac2fe..67e6990938 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/constant/turbulenceProperties @@ -10,16 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar; +simulationType laminar; laminar { - model generalizedNewtonian; + model generalizedNewtonian; viscosityModel powerLaw; nuMin 1e-06; @@ -28,4 +27,5 @@ laminar n 0.4; } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict index 7df23225a9..b2f5b2147e 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/blockMeshDict @@ -79,4 +79,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict index 06be31bba1..964c234ba0 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ maxDeltaT 0.2; maxAlphaCo 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes index 1a6c648324..10f5522e4d 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,4 +75,5 @@ fluxRequired "alpha.*"; } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution index eaf78c1a7e..4542356c81 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -78,9 +77,7 @@ solvers smoother DICGaussSeidel; tolerance 1e-11; relTol 0.01; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict index 825ab2511d..de72ac88a0 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,7 +40,6 @@ regions fieldValues ( volScalarFieldValue alpha.liquid 1 - volScalarFieldValue O2.liquid 0.01 volScalarFieldValue water.liquid 0.99 ); @@ -65,20 +63,17 @@ regions ); } - boxToCell { box (0 0.5 0) (0.5 1.1 1); fieldValues ( volScalarFieldValue alpha.gas 1 - volScalarFieldValue vapour.gas 0.3 volScalarFieldValue CO2.gas 0.2 volScalarFieldValue air.gas 0.5 ); } - ); diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T index a6acc2b690..a7a83fcff7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/T @@ -48,4 +48,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U index 93a426d89a..845c459bc1 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/U @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury index 2a6cb8ccb6..b59d9d3613 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/alpha.mercury @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon index 87b4d0ee63..97221d4a47 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/epsilon @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k index 88cfaf3aaf..196a430d9d 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/k @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh index 4e77489d74..32d9490dc1 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/0.orig/p_rgh @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun index 10a82743b4..5e04c4e256 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun @@ -3,13 +3,16 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -./makeMesh +./Allrun.pre restore0Dir + runApplication setFields -#runApplication $(getApplication) + runApplication decomposePar + runParallel $(getApplication) + runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/makeMesh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun.pre similarity index 100% rename from tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/makeMesh rename to tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/Allrun.pre diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict index d596fb30ce..6a8a2018df 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,4 +26,5 @@ origin (0 0 0); axis (0 0 1); omega 1.2832; // rad/s + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties index b9bd16a4f1..b8f6a5cc8b 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/phaseProperties @@ -18,7 +18,6 @@ type massTransferMultiphaseSystem; phases (gas mercury oil liquid); - oil { type pureMovingPhaseModel; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury index 3f5fb3d62f..ce79112dc0 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.mercury @@ -71,4 +71,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil index af2d3f6b49..a49ddd7d61 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/thermophysicalProperties.oil @@ -53,4 +53,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl deleted file mode 100644 index 9488327587..0000000000 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/triSurface/projectionSurface.stl +++ /dev/null @@ -1,1346 +0,0 @@ -solid AMI1 - facet normal 0.999464 -0.0327281 0 - outer loop - vertex 0.06 0 0 - vertex 0.06 0 0.01 - vertex 0.0598715 -0.00392419 0.01 - endloop - endfacet - facet normal 0.999464 -0.0327281 0 - outer loop - vertex 0.0598715 -0.00392419 0.01 - vertex 0.0598715 -0.00392419 0 - vertex 0.06 0 0 - endloop - endfacet - facet normal 0.995186 -0.0980062 0 - outer loop - vertex 0.0598715 -0.00392419 0 - vertex 0.0598715 -0.00392419 0.01 - vertex 0.0594867 -0.00783157 0.01 - endloop - endfacet - facet normal 0.995186 -0.0980062 0 - outer loop - vertex 0.0594867 -0.00783157 0.01 - vertex 0.0594867 -0.00783157 0 - vertex 0.0598715 -0.00392419 0 - endloop - endfacet - facet normal 0.986642 -0.162902 0 - outer loop - vertex 0.0594867 -0.00783157 0 - vertex 0.0594867 -0.00783157 0.01 - vertex 0.0588471 -0.0117054 0.01 - endloop - endfacet - facet normal 0.986642 -0.162902 0 - outer loop - vertex 0.0588471 -0.0117054 0.01 - vertex 0.0588471 -0.0117054 0 - vertex 0.0594867 -0.00783157 0 - endloop - endfacet - facet normal 0.973875 -0.227085 0 - outer loop - vertex 0.0588471 -0.0117054 0 - vertex 0.0588471 -0.0117054 0.01 - vertex 0.0579555 -0.0155291 0.01 - endloop - endfacet - facet normal 0.973875 -0.227085 0 - outer loop - vertex 0.0579555 -0.0155291 0.01 - vertex 0.0579555 -0.0155291 0 - vertex 0.0588471 -0.0117054 0 - endloop - endfacet - facet normal 0.956945 -0.29027 0 - outer loop - vertex 0.0579555 -0.0155291 0 - vertex 0.0579555 -0.0155291 0.01 - vertex 0.0568158 -0.0192864 0.01 - endloop - endfacet - facet normal 0.956945 -0.29027 0 - outer loop - vertex 0.0568158 -0.0192864 0.01 - vertex 0.0568158 -0.0192864 0 - vertex 0.0579555 -0.0155291 0 - endloop - endfacet - facet normal 0.935908 -0.352245 0 - outer loop - vertex 0.0568158 -0.0192864 0 - vertex 0.0568158 -0.0192864 0.01 - vertex 0.0554328 -0.022961 0.01 - endloop - endfacet - facet normal 0.935908 -0.352245 0 - outer loop - vertex 0.0554328 -0.022961 0.01 - vertex 0.0554328 -0.022961 0 - vertex 0.0568158 -0.0192864 0 - endloop - endfacet - facet normal 0.910864 -0.412707 0 - outer loop - vertex 0.0554328 -0.022961 0 - vertex 0.0554328 -0.022961 0.01 - vertex 0.0538124 -0.0265373 0.01 - endloop - endfacet - facet normal 0.910864 -0.412707 0 - outer loop - vertex 0.0538124 -0.0265373 0.01 - vertex 0.0538124 -0.0265373 0 - vertex 0.0554328 -0.022961 0 - endloop - endfacet - facet normal 0.881916 -0.471406 0 - outer loop - vertex 0.0538124 -0.0265373 0 - vertex 0.0538124 -0.0265373 0.01 - vertex 0.0519615 -0.03 0.01 - endloop - endfacet - facet normal 0.881916 -0.471406 0 - outer loop - vertex 0.0519615 -0.03 0.01 - vertex 0.0519615 -0.03 0 - vertex 0.0538124 -0.0265373 0 - endloop - endfacet - facet normal 0.849207 -0.528061 0 - outer loop - vertex 0.0519615 -0.03 0 - vertex 0.0519615 -0.03 0.01 - vertex 0.0498882 -0.0333342 0.01 - endloop - endfacet - facet normal 0.849207 -0.528061 0 - outer loop - vertex 0.0498882 -0.0333342 0.01 - vertex 0.0498882 -0.0333342 0 - vertex 0.0519615 -0.03 0 - endloop - endfacet - facet normal 0.812846 -0.582478 0 - outer loop - vertex 0.0498882 -0.0333342 0 - vertex 0.0498882 -0.0333342 0.01 - vertex 0.0476012 -0.0365257 0.01 - endloop - endfacet - facet normal 0.812846 -0.582478 0 - outer loop - vertex 0.0476012 -0.0365257 0.01 - vertex 0.0476012 -0.0365257 0 - vertex 0.0498882 -0.0333342 0 - endloop - endfacet - facet normal 0.773005 -0.634399 0 - outer loop - vertex 0.0476012 -0.0365257 0 - vertex 0.0476012 -0.0365257 0.01 - vertex 0.0451104 -0.0395607 0.01 - endloop - endfacet - facet normal 0.773005 -0.634399 0 - outer loop - vertex 0.0451104 -0.0395607 0.01 - vertex 0.0451104 -0.0395607 0 - vertex 0.0476012 -0.0365257 0 - endloop - endfacet - facet normal 0.729867 -0.683589 0 - outer loop - vertex 0.0451104 -0.0395607 0 - vertex 0.0451104 -0.0395607 0.01 - vertex 0.0424264 -0.0424264 0.01 - endloop - endfacet - facet normal 0.729867 -0.683589 0 - outer loop - vertex 0.0424264 -0.0424264 0.01 - vertex 0.0424264 -0.0424264 0 - vertex 0.0451104 -0.0395607 0 - endloop - endfacet - facet normal 0.683589 -0.729867 0 - outer loop - vertex 0.0424264 -0.0424264 0 - vertex 0.0424264 -0.0424264 0.01 - vertex 0.0395607 -0.0451104 0.01 - endloop - endfacet - facet normal 0.683589 -0.729867 0 - outer loop - vertex 0.0395607 -0.0451104 0.01 - vertex 0.0395607 -0.0451104 0 - vertex 0.0424264 -0.0424264 0 - endloop - endfacet - facet normal 0.634399 -0.773005 0 - outer loop - vertex 0.0395607 -0.0451104 0 - vertex 0.0395607 -0.0451104 0.01 - vertex 0.0365257 -0.0476012 0.01 - endloop - endfacet - facet normal 0.634399 -0.773005 0 - outer loop - vertex 0.0365257 -0.0476012 0.01 - vertex 0.0365257 -0.0476012 0 - vertex 0.0395607 -0.0451104 0 - endloop - endfacet - facet normal 0.582478 -0.812846 0 - outer loop - vertex 0.0365257 -0.0476012 0 - vertex 0.0365257 -0.0476012 0.01 - vertex 0.0333342 -0.0498882 0.01 - endloop - endfacet - facet normal 0.582478 -0.812846 0 - outer loop - vertex 0.0333342 -0.0498882 0.01 - vertex 0.0333342 -0.0498882 0 - vertex 0.0365257 -0.0476012 0 - endloop - endfacet - facet normal 0.528061 -0.849207 0 - outer loop - vertex 0.0333342 -0.0498882 0 - vertex 0.0333342 -0.0498882 0.01 - vertex 0.03 -0.0519615 0.01 - endloop - endfacet - facet normal 0.528061 -0.849207 0 - outer loop - vertex 0.03 -0.0519615 0.01 - vertex 0.03 -0.0519615 0 - vertex 0.0333342 -0.0498882 0 - endloop - endfacet - facet normal 0.471406 -0.881916 0 - outer loop - vertex 0.03 -0.0519615 0 - vertex 0.03 -0.0519615 0.01 - vertex 0.0265373 -0.0538124 0.01 - endloop - endfacet - facet normal 0.471406 -0.881916 0 - outer loop - vertex 0.0265373 -0.0538124 0.01 - vertex 0.0265373 -0.0538124 0 - vertex 0.03 -0.0519615 0 - endloop - endfacet - facet normal 0.412707 -0.910864 0 - outer loop - vertex 0.0265373 -0.0538124 0 - vertex 0.0265373 -0.0538124 0.01 - vertex 0.022961 -0.0554328 0.01 - endloop - endfacet - facet normal 0.412707 -0.910864 0 - outer loop - vertex 0.022961 -0.0554328 0.01 - vertex 0.022961 -0.0554328 0 - vertex 0.0265373 -0.0538124 0 - endloop - endfacet - facet normal 0.352245 -0.935908 0 - outer loop - vertex 0.022961 -0.0554328 0 - vertex 0.022961 -0.0554328 0.01 - vertex 0.0192864 -0.0568158 0.01 - endloop - endfacet - facet normal 0.352245 -0.935908 0 - outer loop - vertex 0.0192864 -0.0568158 0.01 - vertex 0.0192864 -0.0568158 0 - vertex 0.022961 -0.0554328 0 - endloop - endfacet - facet normal 0.29027 -0.956945 0 - outer loop - vertex 0.0192864 -0.0568158 0 - vertex 0.0192864 -0.0568158 0.01 - vertex 0.0155291 -0.0579555 0.01 - endloop - endfacet - facet normal 0.29027 -0.956945 0 - outer loop - vertex 0.0155291 -0.0579555 0.01 - vertex 0.0155291 -0.0579555 0 - vertex 0.0192864 -0.0568158 0 - endloop - endfacet - facet normal 0.227085 -0.973875 0 - outer loop - vertex 0.0155291 -0.0579555 0 - vertex 0.0155291 -0.0579555 0.01 - vertex 0.0117054 -0.0588471 0.01 - endloop - endfacet - facet normal 0.227085 -0.973875 0 - outer loop - vertex 0.0117054 -0.0588471 0.01 - vertex 0.0117054 -0.0588471 0 - vertex 0.0155291 -0.0579555 0 - endloop - endfacet - facet normal 0.162902 -0.986642 0 - outer loop - vertex 0.0117054 -0.0588471 0 - vertex 0.0117054 -0.0588471 0.01 - vertex 0.00783157 -0.0594867 0.01 - endloop - endfacet - facet normal 0.162902 -0.986642 0 - outer loop - vertex 0.00783157 -0.0594867 0.01 - vertex 0.00783157 -0.0594867 0 - vertex 0.0117054 -0.0588471 0 - endloop - endfacet - facet normal 0.0980062 -0.995186 0 - outer loop - vertex 0.00783157 -0.0594867 0 - vertex 0.00783157 -0.0594867 0.01 - vertex 0.00392419 -0.0598715 0.01 - endloop - endfacet - facet normal 0.0980062 -0.995186 0 - outer loop - vertex 0.00392419 -0.0598715 0.01 - vertex 0.00392419 -0.0598715 0 - vertex 0.00783157 -0.0594867 0 - endloop - endfacet - facet normal 0.0327281 -0.999464 0 - outer loop - vertex 0.00392419 -0.0598715 0 - vertex 0.00392419 -0.0598715 0.01 - vertex 1.07694e-10 -0.06 0.01 - endloop - endfacet - facet normal 0.0327281 -0.999464 0 - outer loop - vertex 1.07694e-10 -0.06 0.01 - vertex 1.07694e-10 -0.06 0 - vertex 0.00392419 -0.0598715 0 - endloop - endfacet - facet normal -0.0327281 -0.999464 0 - outer loop - vertex 1.07694e-10 -0.06 0 - vertex 1.07694e-10 -0.06 0.01 - vertex -0.00392419 -0.0598715 0.01 - endloop - endfacet - facet normal -0.0327281 -0.999464 -0 - outer loop - vertex -0.00392419 -0.0598715 0.01 - vertex -0.00392419 -0.0598715 0 - vertex 1.07694e-10 -0.06 0 - endloop - endfacet - facet normal -0.0980062 -0.995186 0 - outer loop - vertex -0.00392419 -0.0598715 0 - vertex -0.00392419 -0.0598715 0.01 - vertex -0.00783157 -0.0594867 0.01 - endloop - endfacet - facet normal -0.0980062 -0.995186 -0 - outer loop - vertex -0.00783157 -0.0594867 0.01 - vertex -0.00783157 -0.0594867 0 - vertex -0.00392419 -0.0598715 0 - endloop - endfacet - facet normal -0.162902 -0.986642 0 - outer loop - vertex -0.00783157 -0.0594867 0 - vertex -0.00783157 -0.0594867 0.01 - vertex -0.0117054 -0.0588471 0.01 - endloop - endfacet - facet normal -0.162902 -0.986642 -0 - outer loop - vertex -0.0117054 -0.0588471 0.01 - vertex -0.0117054 -0.0588471 0 - vertex -0.00783157 -0.0594867 0 - endloop - endfacet - facet normal -0.227085 -0.973875 0 - outer loop - vertex -0.0117054 -0.0588471 0 - vertex -0.0117054 -0.0588471 0.01 - vertex -0.0155291 -0.0579555 0.01 - endloop - endfacet - facet normal -0.227085 -0.973875 -0 - outer loop - vertex -0.0155291 -0.0579555 0.01 - vertex -0.0155291 -0.0579555 0 - vertex -0.0117054 -0.0588471 0 - endloop - endfacet - facet normal -0.29027 -0.956945 0 - outer loop - vertex -0.0155291 -0.0579555 0 - vertex -0.0155291 -0.0579555 0.01 - vertex -0.0192864 -0.0568158 0.01 - endloop - endfacet - facet normal -0.29027 -0.956945 -0 - outer loop - vertex -0.0192864 -0.0568158 0.01 - vertex -0.0192864 -0.0568158 0 - vertex -0.0155291 -0.0579555 0 - endloop - endfacet - facet normal -0.352245 -0.935908 0 - outer loop - vertex -0.0192864 -0.0568158 0 - vertex -0.0192864 -0.0568158 0.01 - vertex -0.022961 -0.0554328 0.01 - endloop - endfacet - facet normal -0.352245 -0.935908 -0 - outer loop - vertex -0.022961 -0.0554328 0.01 - vertex -0.022961 -0.0554328 0 - vertex -0.0192864 -0.0568158 0 - endloop - endfacet - facet normal -0.412707 -0.910864 0 - outer loop - vertex -0.022961 -0.0554328 0 - vertex -0.022961 -0.0554328 0.01 - vertex -0.0265373 -0.0538124 0.01 - endloop - endfacet - facet normal -0.412707 -0.910864 -0 - outer loop - vertex -0.0265373 -0.0538124 0.01 - vertex -0.0265373 -0.0538124 0 - vertex -0.022961 -0.0554328 0 - endloop - endfacet - facet normal -0.471406 -0.881916 0 - outer loop - vertex -0.0265373 -0.0538124 0 - vertex -0.0265373 -0.0538124 0.01 - vertex -0.03 -0.0519615 0.01 - endloop - endfacet - facet normal -0.471406 -0.881916 -0 - outer loop - vertex -0.03 -0.0519615 0.01 - vertex -0.03 -0.0519615 0 - vertex -0.0265373 -0.0538124 0 - endloop - endfacet - facet normal -0.528061 -0.849207 0 - outer loop - vertex -0.03 -0.0519615 0 - vertex -0.03 -0.0519615 0.01 - vertex -0.0333342 -0.0498882 0.01 - endloop - endfacet - facet normal -0.528061 -0.849207 -0 - outer loop - vertex -0.0333342 -0.0498882 0.01 - vertex -0.0333342 -0.0498882 0 - vertex -0.03 -0.0519615 0 - endloop - endfacet - facet normal -0.582478 -0.812846 0 - outer loop - vertex -0.0333342 -0.0498882 0 - vertex -0.0333342 -0.0498882 0.01 - vertex -0.0365257 -0.0476012 0.01 - endloop - endfacet - facet normal -0.582478 -0.812846 -0 - outer loop - vertex -0.0365257 -0.0476012 0.01 - vertex -0.0365257 -0.0476012 0 - vertex -0.0333342 -0.0498882 0 - endloop - endfacet - facet normal -0.634399 -0.773005 0 - outer loop - vertex -0.0365257 -0.0476012 0 - vertex -0.0365257 -0.0476012 0.01 - vertex -0.0395607 -0.0451104 0.01 - endloop - endfacet - facet normal -0.634399 -0.773005 -0 - outer loop - vertex -0.0395607 -0.0451104 0.01 - vertex -0.0395607 -0.0451104 0 - vertex -0.0365257 -0.0476012 0 - endloop - endfacet - facet normal -0.683589 -0.729867 0 - outer loop - vertex -0.0395607 -0.0451104 0 - vertex -0.0395607 -0.0451104 0.01 - vertex -0.0424264 -0.0424264 0.01 - endloop - endfacet - facet normal -0.683589 -0.729867 -0 - outer loop - vertex -0.0424264 -0.0424264 0.01 - vertex -0.0424264 -0.0424264 0 - vertex -0.0395607 -0.0451104 0 - endloop - endfacet - facet normal -0.729867 -0.683589 0 - outer loop - vertex -0.0424264 -0.0424264 0 - vertex -0.0424264 -0.0424264 0.01 - vertex -0.0451104 -0.0395607 0.01 - endloop - endfacet - facet normal -0.729867 -0.683589 -0 - outer loop - vertex -0.0451104 -0.0395607 0.01 - vertex -0.0451104 -0.0395607 0 - vertex -0.0424264 -0.0424264 0 - endloop - endfacet - facet normal -0.773005 -0.634399 0 - outer loop - vertex -0.0451104 -0.0395607 0 - vertex -0.0451104 -0.0395607 0.01 - vertex -0.0476012 -0.0365257 0.01 - endloop - endfacet - facet normal -0.773005 -0.634399 -0 - outer loop - vertex -0.0476012 -0.0365257 0.01 - vertex -0.0476012 -0.0365257 0 - vertex -0.0451104 -0.0395607 0 - endloop - endfacet - facet normal -0.812846 -0.582478 0 - outer loop - vertex -0.0476012 -0.0365257 0 - vertex -0.0476012 -0.0365257 0.01 - vertex -0.0498882 -0.0333342 0.01 - endloop - endfacet - facet normal -0.812846 -0.582478 -0 - outer loop - vertex -0.0498882 -0.0333342 0.01 - vertex -0.0498882 -0.0333342 0 - vertex -0.0476012 -0.0365257 0 - endloop - endfacet - facet normal -0.849207 -0.528061 0 - outer loop - vertex -0.0498882 -0.0333342 0 - vertex -0.0498882 -0.0333342 0.01 - vertex -0.0519615 -0.03 0.01 - endloop - endfacet - facet normal -0.849207 -0.528061 -0 - outer loop - vertex -0.0519615 -0.03 0.01 - vertex -0.0519615 -0.03 0 - vertex -0.0498882 -0.0333342 0 - endloop - endfacet - facet normal -0.881916 -0.471406 0 - outer loop - vertex -0.0519615 -0.03 0 - vertex -0.0519615 -0.03 0.01 - vertex -0.0538124 -0.0265373 0.01 - endloop - endfacet - facet normal -0.881916 -0.471406 -0 - outer loop - vertex -0.0538124 -0.0265373 0.01 - vertex -0.0538124 -0.0265373 0 - vertex -0.0519615 -0.03 0 - endloop - endfacet - facet normal -0.910864 -0.412707 0 - outer loop - vertex -0.0538124 -0.0265373 0 - vertex -0.0538124 -0.0265373 0.01 - vertex -0.0554328 -0.022961 0.01 - endloop - endfacet - facet normal -0.910864 -0.412707 -0 - outer loop - vertex -0.0554328 -0.022961 0.01 - vertex -0.0554328 -0.022961 0 - vertex -0.0538124 -0.0265373 0 - endloop - endfacet - facet normal -0.935908 -0.352245 0 - outer loop - vertex -0.0554328 -0.022961 0 - vertex -0.0554328 -0.022961 0.01 - vertex -0.0568158 -0.0192864 0.01 - endloop - endfacet - facet normal -0.935908 -0.352245 -0 - outer loop - vertex -0.0568158 -0.0192864 0.01 - vertex -0.0568158 -0.0192864 0 - vertex -0.0554328 -0.022961 0 - endloop - endfacet - facet normal -0.956945 -0.29027 0 - outer loop - vertex -0.0568158 -0.0192864 0 - vertex -0.0568158 -0.0192864 0.01 - vertex -0.0579555 -0.0155291 0.01 - endloop - endfacet - facet normal -0.956945 -0.29027 -0 - outer loop - vertex -0.0579555 -0.0155291 0.01 - vertex -0.0579555 -0.0155291 0 - vertex -0.0568158 -0.0192864 0 - endloop - endfacet - facet normal -0.973875 -0.227085 0 - outer loop - vertex -0.0579555 -0.0155291 0 - vertex -0.0579555 -0.0155291 0.01 - vertex -0.0588471 -0.0117054 0.01 - endloop - endfacet - facet normal -0.973875 -0.227085 -0 - outer loop - vertex -0.0588471 -0.0117054 0.01 - vertex -0.0588471 -0.0117054 0 - vertex -0.0579555 -0.0155291 0 - endloop - endfacet - facet normal -0.986642 -0.162902 0 - outer loop - vertex -0.0588471 -0.0117054 0 - vertex -0.0588471 -0.0117054 0.01 - vertex -0.0594867 -0.00783157 0.01 - endloop - endfacet - facet normal -0.986642 -0.162902 -0 - outer loop - vertex -0.0594867 -0.00783157 0.01 - vertex -0.0594867 -0.00783157 0 - vertex -0.0588471 -0.0117054 0 - endloop - endfacet - facet normal -0.995186 -0.0980062 0 - outer loop - vertex -0.0594867 -0.00783157 0 - vertex -0.0594867 -0.00783157 0.01 - vertex -0.0598715 -0.00392419 0.01 - endloop - endfacet - facet normal -0.995186 -0.0980062 -0 - outer loop - vertex -0.0598715 -0.00392419 0.01 - vertex -0.0598715 -0.00392419 0 - vertex -0.0594867 -0.00783157 0 - endloop - endfacet - facet normal -0.999464 -0.0327281 0 - outer loop - vertex -0.0598715 -0.00392419 0 - vertex -0.0598715 -0.00392419 0.01 - vertex -0.06 2.15388e-10 0.01 - endloop - endfacet - facet normal -0.999464 -0.0327281 -0 - outer loop - vertex -0.06 2.15388e-10 0.01 - vertex -0.06 2.15388e-10 0 - vertex -0.0598715 -0.00392419 0 - endloop - endfacet - facet normal -0.999464 0.0327281 0 - outer loop - vertex -0.06 2.15388e-10 0 - vertex -0.06 2.15388e-10 0.01 - vertex -0.0598715 0.00392419 0.01 - endloop - endfacet - facet normal -0.999464 0.0327281 0 - outer loop - vertex -0.0598715 0.00392419 0.01 - vertex -0.0598715 0.00392419 0 - vertex -0.06 2.15388e-10 0 - endloop - endfacet - facet normal -0.995186 0.0980062 0 - outer loop - vertex -0.0598715 0.00392419 0 - vertex -0.0598715 0.00392419 0.01 - vertex -0.0594867 0.00783157 0.01 - endloop - endfacet - facet normal -0.995186 0.0980062 0 - outer loop - vertex -0.0594867 0.00783157 0.01 - vertex -0.0594867 0.00783157 0 - vertex -0.0598715 0.00392419 0 - endloop - endfacet - facet normal -0.986642 0.162902 0 - outer loop - vertex -0.0594867 0.00783157 0 - vertex -0.0594867 0.00783157 0.01 - vertex -0.0588471 0.0117054 0.01 - endloop - endfacet - facet normal -0.986642 0.162902 0 - outer loop - vertex -0.0588471 0.0117054 0.01 - vertex -0.0588471 0.0117054 0 - vertex -0.0594867 0.00783157 0 - endloop - endfacet - facet normal -0.973875 0.227085 0 - outer loop - vertex -0.0588471 0.0117054 0 - vertex -0.0588471 0.0117054 0.01 - vertex -0.0579555 0.0155291 0.01 - endloop - endfacet - facet normal -0.973875 0.227085 0 - outer loop - vertex -0.0579555 0.0155291 0.01 - vertex -0.0579555 0.0155291 0 - vertex -0.0588471 0.0117054 0 - endloop - endfacet - facet normal -0.956945 0.29027 0 - outer loop - vertex -0.0579555 0.0155291 0 - vertex -0.0579555 0.0155291 0.01 - vertex -0.0568158 0.0192864 0.01 - endloop - endfacet - facet normal -0.956945 0.29027 0 - outer loop - vertex -0.0568158 0.0192864 0.01 - vertex -0.0568158 0.0192864 0 - vertex -0.0579555 0.0155291 0 - endloop - endfacet - facet normal -0.935908 0.352245 0 - outer loop - vertex -0.0568158 0.0192864 0 - vertex -0.0568158 0.0192864 0.01 - vertex -0.0554328 0.022961 0.01 - endloop - endfacet - facet normal -0.935908 0.352245 0 - outer loop - vertex -0.0554328 0.022961 0.01 - vertex -0.0554328 0.022961 0 - vertex -0.0568158 0.0192864 0 - endloop - endfacet - facet normal -0.910864 0.412707 0 - outer loop - vertex -0.0554328 0.022961 0 - vertex -0.0554328 0.022961 0.01 - vertex -0.0538124 0.0265373 0.01 - endloop - endfacet - facet normal -0.910864 0.412707 0 - outer loop - vertex -0.0538124 0.0265373 0.01 - vertex -0.0538124 0.0265373 0 - vertex -0.0554328 0.022961 0 - endloop - endfacet - facet normal -0.881916 0.471406 0 - outer loop - vertex -0.0538124 0.0265373 0 - vertex -0.0538124 0.0265373 0.01 - vertex -0.0519615 0.03 0.01 - endloop - endfacet - facet normal -0.881916 0.471406 0 - outer loop - vertex -0.0519615 0.03 0.01 - vertex -0.0519615 0.03 0 - vertex -0.0538124 0.0265373 0 - endloop - endfacet - facet normal -0.849207 0.528061 0 - outer loop - vertex -0.0519615 0.03 0 - vertex -0.0519615 0.03 0.01 - vertex -0.0498882 0.0333342 0.01 - endloop - endfacet - facet normal -0.849207 0.528061 0 - outer loop - vertex -0.0498882 0.0333342 0.01 - vertex -0.0498882 0.0333342 0 - vertex -0.0519615 0.03 0 - endloop - endfacet - facet normal -0.812846 0.582478 0 - outer loop - vertex -0.0498882 0.0333342 0 - vertex -0.0498882 0.0333342 0.01 - vertex -0.0476012 0.0365257 0.01 - endloop - endfacet - facet normal -0.812846 0.582478 0 - outer loop - vertex -0.0476012 0.0365257 0.01 - vertex -0.0476012 0.0365257 0 - vertex -0.0498882 0.0333342 0 - endloop - endfacet - facet normal -0.773005 0.634399 0 - outer loop - vertex -0.0476012 0.0365257 0 - vertex -0.0476012 0.0365257 0.01 - vertex -0.0451104 0.0395607 0.01 - endloop - endfacet - facet normal -0.773005 0.634399 0 - outer loop - vertex -0.0451104 0.0395607 0.01 - vertex -0.0451104 0.0395607 0 - vertex -0.0476012 0.0365257 0 - endloop - endfacet - facet normal -0.729867 0.683589 0 - outer loop - vertex -0.0451104 0.0395607 0 - vertex -0.0451104 0.0395607 0.01 - vertex -0.0424264 0.0424264 0.01 - endloop - endfacet - facet normal -0.729867 0.683589 0 - outer loop - vertex -0.0424264 0.0424264 0.01 - vertex -0.0424264 0.0424264 0 - vertex -0.0451104 0.0395607 0 - endloop - endfacet - facet normal -0.683589 0.729867 0 - outer loop - vertex -0.0424264 0.0424264 0 - vertex -0.0424264 0.0424264 0.01 - vertex -0.0395607 0.0451104 0.01 - endloop - endfacet - facet normal -0.683589 0.729867 0 - outer loop - vertex -0.0395607 0.0451104 0.01 - vertex -0.0395607 0.0451104 0 - vertex -0.0424264 0.0424264 0 - endloop - endfacet - facet normal -0.634399 0.773005 0 - outer loop - vertex -0.0395607 0.0451104 0 - vertex -0.0395607 0.0451104 0.01 - vertex -0.0365257 0.0476012 0.01 - endloop - endfacet - facet normal -0.634399 0.773005 0 - outer loop - vertex -0.0365257 0.0476012 0.01 - vertex -0.0365257 0.0476012 0 - vertex -0.0395607 0.0451104 0 - endloop - endfacet - facet normal -0.582478 0.812846 0 - outer loop - vertex -0.0365257 0.0476012 0 - vertex -0.0365257 0.0476012 0.01 - vertex -0.0333342 0.0498882 0.01 - endloop - endfacet - facet normal -0.582478 0.812846 0 - outer loop - vertex -0.0333342 0.0498882 0.01 - vertex -0.0333342 0.0498882 0 - vertex -0.0365257 0.0476012 0 - endloop - endfacet - facet normal -0.528061 0.849207 0 - outer loop - vertex -0.0333342 0.0498882 0 - vertex -0.0333342 0.0498882 0.01 - vertex -0.03 0.0519615 0.01 - endloop - endfacet - facet normal -0.528061 0.849207 0 - outer loop - vertex -0.03 0.0519615 0.01 - vertex -0.03 0.0519615 0 - vertex -0.0333342 0.0498882 0 - endloop - endfacet - facet normal -0.471406 0.881916 0 - outer loop - vertex -0.03 0.0519615 0 - vertex -0.03 0.0519615 0.01 - vertex -0.0265373 0.0538124 0.01 - endloop - endfacet - facet normal -0.471406 0.881916 0 - outer loop - vertex -0.0265373 0.0538124 0.01 - vertex -0.0265373 0.0538124 0 - vertex -0.03 0.0519615 0 - endloop - endfacet - facet normal -0.412707 0.910864 0 - outer loop - vertex -0.0265373 0.0538124 0 - vertex -0.0265373 0.0538124 0.01 - vertex -0.022961 0.0554328 0.01 - endloop - endfacet - facet normal -0.412707 0.910864 0 - outer loop - vertex -0.022961 0.0554328 0.01 - vertex -0.022961 0.0554328 0 - vertex -0.0265373 0.0538124 0 - endloop - endfacet - facet normal -0.352245 0.935908 0 - outer loop - vertex -0.022961 0.0554328 0 - vertex -0.022961 0.0554328 0.01 - vertex -0.0192864 0.0568158 0.01 - endloop - endfacet - facet normal -0.352245 0.935908 0 - outer loop - vertex -0.0192864 0.0568158 0.01 - vertex -0.0192864 0.0568158 0 - vertex -0.022961 0.0554328 0 - endloop - endfacet - facet normal -0.29027 0.956945 0 - outer loop - vertex -0.0192864 0.0568158 0 - vertex -0.0192864 0.0568158 0.01 - vertex -0.0155291 0.0579555 0.01 - endloop - endfacet - facet normal -0.29027 0.956945 0 - outer loop - vertex -0.0155291 0.0579555 0.01 - vertex -0.0155291 0.0579555 0 - vertex -0.0192864 0.0568158 0 - endloop - endfacet - facet normal -0.227085 0.973875 0 - outer loop - vertex -0.0155291 0.0579555 0 - vertex -0.0155291 0.0579555 0.01 - vertex -0.0117054 0.0588471 0.01 - endloop - endfacet - facet normal -0.227085 0.973875 0 - outer loop - vertex -0.0117054 0.0588471 0.01 - vertex -0.0117054 0.0588471 0 - vertex -0.0155291 0.0579555 0 - endloop - endfacet - facet normal -0.162902 0.986642 0 - outer loop - vertex -0.0117054 0.0588471 0 - vertex -0.0117054 0.0588471 0.01 - vertex -0.00783157 0.0594867 0.01 - endloop - endfacet - facet normal -0.162902 0.986642 0 - outer loop - vertex -0.00783157 0.0594867 0.01 - vertex -0.00783157 0.0594867 0 - vertex -0.0117054 0.0588471 0 - endloop - endfacet - facet normal -0.0980062 0.995186 0 - outer loop - vertex -0.00783157 0.0594867 0 - vertex -0.00783157 0.0594867 0.01 - vertex -0.00392419 0.0598715 0.01 - endloop - endfacet - facet normal -0.0980062 0.995186 0 - outer loop - vertex -0.00392419 0.0598715 0.01 - vertex -0.00392419 0.0598715 0 - vertex -0.00783157 0.0594867 0 - endloop - endfacet - facet normal -0.0327281 0.999464 0 - outer loop - vertex -0.00392419 0.0598715 0 - vertex -0.00392419 0.0598715 0.01 - vertex 1.07694e-10 0.06 0.01 - endloop - endfacet - facet normal -0.0327281 0.999464 0 - outer loop - vertex 1.07694e-10 0.06 0.01 - vertex 1.07694e-10 0.06 0 - vertex -0.00392419 0.0598715 0 - endloop - endfacet - facet normal 0.0327281 0.999464 -0 - outer loop - vertex 1.07694e-10 0.06 0 - vertex 1.07694e-10 0.06 0.01 - vertex 0.00392419 0.0598715 0.01 - endloop - endfacet - facet normal 0.0327281 0.999464 0 - outer loop - vertex 0.00392419 0.0598715 0.01 - vertex 0.00392419 0.0598715 0 - vertex 1.07694e-10 0.06 0 - endloop - endfacet - facet normal 0.0980062 0.995186 -0 - outer loop - vertex 0.00392419 0.0598715 0 - vertex 0.00392419 0.0598715 0.01 - vertex 0.00783157 0.0594867 0.01 - endloop - endfacet - facet normal 0.0980062 0.995186 0 - outer loop - vertex 0.00783157 0.0594867 0.01 - vertex 0.00783157 0.0594867 0 - vertex 0.00392419 0.0598715 0 - endloop - endfacet - facet normal 0.162902 0.986642 -0 - outer loop - vertex 0.00783157 0.0594867 0 - vertex 0.00783157 0.0594867 0.01 - vertex 0.0117054 0.0588471 0.01 - endloop - endfacet - facet normal 0.162902 0.986642 0 - outer loop - vertex 0.0117054 0.0588471 0.01 - vertex 0.0117054 0.0588471 0 - vertex 0.00783157 0.0594867 0 - endloop - endfacet - facet normal 0.227085 0.973875 -0 - outer loop - vertex 0.0117054 0.0588471 0 - vertex 0.0117054 0.0588471 0.01 - vertex 0.0155291 0.0579555 0.01 - endloop - endfacet - facet normal 0.227085 0.973875 0 - outer loop - vertex 0.0155291 0.0579555 0.01 - vertex 0.0155291 0.0579555 0 - vertex 0.0117054 0.0588471 0 - endloop - endfacet - facet normal 0.29027 0.956945 -0 - outer loop - vertex 0.0155291 0.0579555 0 - vertex 0.0155291 0.0579555 0.01 - vertex 0.0192864 0.0568158 0.01 - endloop - endfacet - facet normal 0.29027 0.956945 0 - outer loop - vertex 0.0192864 0.0568158 0.01 - vertex 0.0192864 0.0568158 0 - vertex 0.0155291 0.0579555 0 - endloop - endfacet - facet normal 0.352245 0.935908 -0 - outer loop - vertex 0.0192864 0.0568158 0 - vertex 0.0192864 0.0568158 0.01 - vertex 0.022961 0.0554328 0.01 - endloop - endfacet - facet normal 0.352245 0.935908 0 - outer loop - vertex 0.022961 0.0554328 0.01 - vertex 0.022961 0.0554328 0 - vertex 0.0192864 0.0568158 0 - endloop - endfacet - facet normal 0.412707 0.910864 -0 - outer loop - vertex 0.022961 0.0554328 0 - vertex 0.022961 0.0554328 0.01 - vertex 0.0265373 0.0538124 0.01 - endloop - endfacet - facet normal 0.412707 0.910864 0 - outer loop - vertex 0.0265373 0.0538124 0.01 - vertex 0.0265373 0.0538124 0 - vertex 0.022961 0.0554328 0 - endloop - endfacet - facet normal 0.471406 0.881916 -0 - outer loop - vertex 0.0265373 0.0538124 0 - vertex 0.0265373 0.0538124 0.01 - vertex 0.03 0.0519615 0.01 - endloop - endfacet - facet normal 0.471406 0.881916 0 - outer loop - vertex 0.03 0.0519615 0.01 - vertex 0.03 0.0519615 0 - vertex 0.0265373 0.0538124 0 - endloop - endfacet - facet normal 0.528061 0.849207 -0 - outer loop - vertex 0.03 0.0519615 0 - vertex 0.03 0.0519615 0.01 - vertex 0.0333342 0.0498882 0.01 - endloop - endfacet - facet normal 0.528061 0.849207 0 - outer loop - vertex 0.0333342 0.0498882 0.01 - vertex 0.0333342 0.0498882 0 - vertex 0.03 0.0519615 0 - endloop - endfacet - facet normal 0.582478 0.812846 -0 - outer loop - vertex 0.0333342 0.0498882 0 - vertex 0.0333342 0.0498882 0.01 - vertex 0.0365257 0.0476012 0.01 - endloop - endfacet - facet normal 0.582478 0.812846 0 - outer loop - vertex 0.0365257 0.0476012 0.01 - vertex 0.0365257 0.0476012 0 - vertex 0.0333342 0.0498882 0 - endloop - endfacet - facet normal 0.634399 0.773005 -0 - outer loop - vertex 0.0365257 0.0476012 0 - vertex 0.0365257 0.0476012 0.01 - vertex 0.0395607 0.0451104 0.01 - endloop - endfacet - facet normal 0.634399 0.773005 0 - outer loop - vertex 0.0395607 0.0451104 0.01 - vertex 0.0395607 0.0451104 0 - vertex 0.0365257 0.0476012 0 - endloop - endfacet - facet normal 0.683589 0.729867 -0 - outer loop - vertex 0.0395607 0.0451104 0 - vertex 0.0395607 0.0451104 0.01 - vertex 0.0424264 0.0424264 0.01 - endloop - endfacet - facet normal 0.683589 0.729867 0 - outer loop - vertex 0.0424264 0.0424264 0.01 - vertex 0.0424264 0.0424264 0 - vertex 0.0395607 0.0451104 0 - endloop - endfacet - facet normal 0.729867 0.683589 -0 - outer loop - vertex 0.0424264 0.0424264 0 - vertex 0.0424264 0.0424264 0.01 - vertex 0.0451104 0.0395607 0.01 - endloop - endfacet - facet normal 0.729867 0.683589 0 - outer loop - vertex 0.0451104 0.0395607 0.01 - vertex 0.0451104 0.0395607 0 - vertex 0.0424264 0.0424264 0 - endloop - endfacet - facet normal 0.773005 0.634399 -0 - outer loop - vertex 0.0451104 0.0395607 0 - vertex 0.0451104 0.0395607 0.01 - vertex 0.0476012 0.0365257 0.01 - endloop - endfacet - facet normal 0.773005 0.634399 0 - outer loop - vertex 0.0476012 0.0365257 0.01 - vertex 0.0476012 0.0365257 0 - vertex 0.0451104 0.0395607 0 - endloop - endfacet - facet normal 0.812846 0.582478 -0 - outer loop - vertex 0.0476012 0.0365257 0 - vertex 0.0476012 0.0365257 0.01 - vertex 0.0498882 0.0333342 0.01 - endloop - endfacet - facet normal 0.812846 0.582478 0 - outer loop - vertex 0.0498882 0.0333342 0.01 - vertex 0.0498882 0.0333342 0 - vertex 0.0476012 0.0365257 0 - endloop - endfacet - facet normal 0.849207 0.528061 -0 - outer loop - vertex 0.0498882 0.0333342 0 - vertex 0.0498882 0.0333342 0.01 - vertex 0.0519615 0.03 0.01 - endloop - endfacet - facet normal 0.849207 0.528061 0 - outer loop - vertex 0.0519615 0.03 0.01 - vertex 0.0519615 0.03 0 - vertex 0.0498882 0.0333342 0 - endloop - endfacet - facet normal 0.881916 0.471406 -0 - outer loop - vertex 0.0519615 0.03 0 - vertex 0.0519615 0.03 0.01 - vertex 0.0538124 0.0265373 0.01 - endloop - endfacet - facet normal 0.881916 0.471406 0 - outer loop - vertex 0.0538124 0.0265373 0.01 - vertex 0.0538124 0.0265373 0 - vertex 0.0519615 0.03 0 - endloop - endfacet - facet normal 0.910864 0.412707 -0 - outer loop - vertex 0.0538124 0.0265373 0 - vertex 0.0538124 0.0265373 0.01 - vertex 0.0554328 0.022961 0.01 - endloop - endfacet - facet normal 0.910864 0.412707 0 - outer loop - vertex 0.0554328 0.022961 0.01 - vertex 0.0554328 0.022961 0 - vertex 0.0538124 0.0265373 0 - endloop - endfacet - facet normal 0.935908 0.352245 -0 - outer loop - vertex 0.0554328 0.022961 0 - vertex 0.0554328 0.022961 0.01 - vertex 0.0568158 0.0192864 0.01 - endloop - endfacet - facet normal 0.935908 0.352245 0 - outer loop - vertex 0.0568158 0.0192864 0.01 - vertex 0.0568158 0.0192864 0 - vertex 0.0554328 0.022961 0 - endloop - endfacet - facet normal 0.956945 0.29027 -0 - outer loop - vertex 0.0568158 0.0192864 0 - vertex 0.0568158 0.0192864 0.01 - vertex 0.0579555 0.0155291 0.01 - endloop - endfacet - facet normal 0.956945 0.29027 0 - outer loop - vertex 0.0579555 0.0155291 0.01 - vertex 0.0579555 0.0155291 0 - vertex 0.0568158 0.0192864 0 - endloop - endfacet - facet normal 0.973875 0.227085 -0 - outer loop - vertex 0.0579555 0.0155291 0 - vertex 0.0579555 0.0155291 0.01 - vertex 0.0588471 0.0117054 0.01 - endloop - endfacet - facet normal 0.973875 0.227085 0 - outer loop - vertex 0.0588471 0.0117054 0.01 - vertex 0.0588471 0.0117054 0 - vertex 0.0579555 0.0155291 0 - endloop - endfacet - facet normal 0.986642 0.162902 -0 - outer loop - vertex 0.0588471 0.0117054 0 - vertex 0.0588471 0.0117054 0.01 - vertex 0.0594867 0.00783157 0.01 - endloop - endfacet - facet normal 0.986642 0.162902 0 - outer loop - vertex 0.0594867 0.00783157 0.01 - vertex 0.0594867 0.00783157 0 - vertex 0.0588471 0.0117054 0 - endloop - endfacet - facet normal 0.995186 0.0980062 -0 - outer loop - vertex 0.0594867 0.00783157 0 - vertex 0.0594867 0.00783157 0.01 - vertex 0.0598715 0.00392419 0.01 - endloop - endfacet - facet normal 0.995186 0.0980062 0 - outer loop - vertex 0.0598715 0.00392419 0.01 - vertex 0.0598715 0.00392419 0 - vertex 0.0594867 0.00783157 0 - endloop - endfacet - facet normal 0.999464 0.0327281 -0 - outer loop - vertex 0.0598715 0.00392419 0 - vertex 0.0598715 0.00392419 0.01 - vertex 0.06 0 0.01 - endloop - endfacet - facet normal 0.999464 0.0327281 0 - outer loop - vertex 0.06 0 0.01 - vertex 0.06 0 0 - vertex 0.0598715 0.00392419 0 - endloop - endfacet -endsolid AMI1 diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict index 453b9d2248..81ea05d513 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/controlDict @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application icoReactingMultiphaseInterFoam; -startFrom latestTime;//startTime; +startFrom latestTime; startTime 0; @@ -53,4 +52,5 @@ maxDeltaT 0.2; maxAlphaCo 0.7; + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict index 763854b64d..502f3507ae 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/decomposeParDict @@ -22,9 +22,5 @@ numberOfSubdomains 4; method scotch; -distributed no; - -roots ( ); - // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes index 3d51db4688..28b296e260 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -63,7 +62,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } fluxRequired @@ -73,4 +72,5 @@ fluxRequired "alpha.*"; } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution index eff5f35e1b..e2af0f6063 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,7 +43,6 @@ solvers // Compressiion factor for species in each alpha phase // NOTE: It should be similar to cAlpha cYi 1; - } "U.*" @@ -68,7 +66,6 @@ solvers { solver PBiCGStab; preconditioner FDIC; - tolerance 1e-9; relTol 0.01; }; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict index a9d2a38754..9aefa887db 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +53,6 @@ regions ); } - boxToCell { box (0 -1 -1) (1 0 1); @@ -63,7 +61,6 @@ regions volScalarFieldValue alpha.gas 1 ); } - ); diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict index a4db29b04b..3536410c18 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/mixerVesselAMI2D/system/topoSetDict @@ -29,4 +29,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T index acce5d6b0e..2d05c0583d 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T @@ -58,11 +58,13 @@ boundaryField kappaMethod fluidThermo; value $internalField; } + right { type zeroGradient; value $internalField; } + bottom { type externalWallHeatFluxTemperature; @@ -71,12 +73,14 @@ boundaryField kappaMethod fluidThermo; value $internalField; } + top { type inletOutlet; value uniform 371; inletValue uniform 371; } + frontAndBack { type zeroGradient; @@ -84,4 +88,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U index 86cf67df0f..412c7ddfc4 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -25,22 +25,26 @@ boundaryField type fixedValue; value uniform (0 0 0); } + right { type fixedValue; value uniform (0 0 0); } + bottom { type fixedValue; value uniform (0 0 0); } + top { type pressureInletOutletVelocity; value uniform (0 0 0); inletValue uniform (0 0 0); } + frontAndBack { type fixedValue; @@ -48,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas index 0f20613e65..a6513d4576 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/air.gas @@ -24,20 +24,24 @@ boundaryField { type zeroGradient; } + right { type zeroGradient; } + bottom { type zeroGradient; } + top { type inletOutlet; inletValue uniform 1; value uniform 1; } + frontAndBack { type zeroGradient; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas index e004d20427..d5060fc586 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.gas @@ -20,28 +20,33 @@ internalField uniform 0; boundaryField { - left + left { type zeroGradient; } + right { type zeroGradient; } + bottom { type zeroGradient; } + top { type inletOutlet; inletValue uniform 1; value uniform 1; } + frontAndBack { type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid index 5ed5bf7847..d28a5c0d6b 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/alpha.liquid @@ -24,24 +24,29 @@ boundaryField { type zeroGradient; } + right { type zeroGradient; } + bottom { type zeroGradient; } + top { type inletOutlet; inletValue uniform 0; value uniform 0; } + frontAndBack { type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh index 5e31bb3313..bdc0fbe2e7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/p_rgh @@ -25,22 +25,26 @@ boundaryField type fixedFluxPressure; value uniform 1e5; } + right { type fixedFluxPressure; value uniform 1e5; } + bottom { type fixedFluxPressure; value uniform 1e5; } + top { type prghTotalPressure; p0 $internalField; value uniform 100000; } + frontAndBack { type fixedFluxPressure; @@ -48,4 +52,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas index 3e3faeffbf..ea0994bf4c 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/vapour.gas @@ -24,20 +24,24 @@ boundaryField { type zeroGradient; } + right { type zeroGradient; } + bottom { type zeroGradient; } + top { type inletOutlet; inletValue uniform 0; value uniform 0; } + frontAndBack { type zeroGradient; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun index 6a7592f324..70ded50baa 100755 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/Allrun @@ -8,9 +8,13 @@ canCompile || exit 0 # Dynamic code restore0Dir runApplication blockMesh + runApplication setFields + runApplication decomposePar + runParallel $(getApplication) + runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README.md similarity index 100% rename from tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README rename to tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README.md diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g index 72a61dd0aa..28b07d0b87 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 -9.81 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties index b31bc43bf3..20954d4241 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/phaseProperties @@ -10,10 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; + object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + type massTransferMultiphaseSystem; phases (gas liquid); @@ -50,4 +51,5 @@ massTransferModel } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas index b2c332812f..08fbe77cb7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,8 +25,6 @@ thermoType energy sensibleEnthalpy; } -// ************************************************************************* // - species ( air @@ -81,3 +78,6 @@ air Pr 0.7; } } + + +// ************************************************************************* // \ No newline at end of file diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid index e36048d3b1..4269bd8157 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,4 +48,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict index 39bd26df71..7b5046e2fb 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict index 7af6c5f99a..8eb6ac8ae1 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +54,6 @@ maxAlphaDdt 1; functions { - mass { type volFieldValue; @@ -75,4 +73,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict index 9fc9240075..d96083400d 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes index 2e3873075e..14a570a845 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution index f142c63606..ede6884c3b 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/fvSolution @@ -10,14 +10,12 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - "alpha.*" { solver PBiCGStab; diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict index e69d37ea3f..423162bf13 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,4 +32,6 @@ regions ); } ); + + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T index 552f509027..5f6a111fa7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/0/T @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object T; } @@ -51,4 +51,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g index bc86019b95..290ced5eee 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/g @@ -17,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties index 3933439b7e..16e821afe3 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/phaseProperties @@ -48,4 +48,5 @@ massTransferModel } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid index a4d08a6bd6..d2ea7d5023 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.liquid @@ -50,4 +50,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid index c3c4947476..6868602084 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/thermophysicalProperties.solid @@ -47,4 +47,5 @@ mixture } } + // ************************************************************************* // \ No newline at end of file diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties index f8eaeffb09..9bc049b7c7 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/constant/turbulenceProperties @@ -16,4 +16,5 @@ FoamFile simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict index ca2914cd87..08a43a95b3 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/blockMeshDict @@ -82,4 +82,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict index 2d624ede08..21a0b4dbfc 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,4 +56,5 @@ maxAlphaDdt 2.3; maxDi 25; + // ************************************************************************* // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes index df3588ecd1..8dc8eb21af 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution index 863ae999ec..f3603c7e6b 100644 --- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution +++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/solidMelting2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,7 +49,6 @@ solvers preconditioner DIC; tolerance 1e-09; relTol 0.02; - //maxIter 0; } p_rghFinal @@ -65,7 +63,6 @@ solvers smoother symGaussSeidel; tolerance 1e-06; relTol 0; - } "Yi.*" diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T index e5a9ecd1b1..6d81da0d28 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/T @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U index 771b585d30..8491b82e0f 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U; } @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid index 0305a9b04c..cc7b1c5816 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/alpha.liquid @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p index 4d560ef267..a733a2cb20 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh index 40684d8a71..cbebbc1e73 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun index 97b73101ac..5f30e6c3bb 100755 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun @@ -4,7 +4,9 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties index f05b309fee..67d63b4721 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties @@ -14,8 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (liquid vapour); // FC-72 - +phases (liquid vapour); // FC-72 sigma 0; @@ -25,7 +24,6 @@ liquid nu 2.64e-7; rho 1583.4; - Cp 1.1072e3; Cv 1.1072e3; // assume Cp for liquid kappa 0.057; @@ -38,7 +36,6 @@ vapour nu 5e-7; rho 14.9; - Cp 895.2; // FC72 vapour Cv 870.4; // Cv = Cp - R/w kappa 0.01; // FC72 vapour @@ -47,4 +44,5 @@ vapour Prt 0.7; + // ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties index 6ca732de14..a8b82a7141 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { RASModel kOmegaSST; turbulence on; + printCoeffs on; } diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict index 8031fcc406..4f50efd9d2 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict @@ -79,4 +79,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict index 9ba2bca748..0dee2ea5e9 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes index a06331261c..2339ecec1c 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,7 +59,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution index db9e42af73..0a92f5106e 100644 --- a/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution +++ b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,13 +49,10 @@ solvers solver GAMG; tolerance 1e-8; relTol 0.01; - smoother DICGaussSeidel; nPreSweeps 0; nPostSweeps 2; - cacheAgglomeration true; - nCellsInCoarsestLevel 10; agglomerator faceAreaPair; mergeLevels 1; @@ -69,17 +65,13 @@ solvers preconditioner { preconditioner GAMG; - tolerance 1e-6; relTol 0; - nVcycles 2; - smoother DICGaussSeidel; nPreSweeps 0; nPostSweeps 2; nFinestSweeps 2; - cacheAgglomeration true; nCellsInCoarsestLevel 10; agglomerator faceAreaPair; diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U index 41289d50e4..85eaaf288a 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/U @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel index 454e7659f4..6c53d505a4 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/alpha.fuel @@ -54,4 +54,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k index a8c2048aef..70a90fcdee 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/k @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda index 0c6c04e255..5ce577cf21 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nuTilda @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut index 5bd9043ff8..ca79fafa7a 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/nut @@ -51,4 +51,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh index 2060b65d1e..1d17f04329 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/0.orig/p_rgh @@ -52,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties index 3e35bf081b..26bc95ef22 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (fuel air); +phases (fuel air); fuel { @@ -33,4 +32,5 @@ air sigma 0.0261; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties index 348d46833f..ee92925b72 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { @@ -89,4 +88,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict index 587b616b4d..9f98e48f1b 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/blockMeshDict @@ -137,4 +137,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict index 0ecec753d7..1bf157be8b 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes index a337c0384d..fc8d7fd63c 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution index 89fc0d71ac..bee8efa91b 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict index de2ebb7c4e..dae3a87983 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 index c5339f78a7..aa00667b45 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 index ca56a40e7a..0c68fdab5a 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water index b89ae971cb..b749015071 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k index 9c2d27a30f..484900850a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega index ffa67b53fa..3dbe418dbc 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega @@ -50,5 +50,4 @@ boundaryField } - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh index 9c30eeb2f4..983a4ecdb7 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun index b1638d242a..439656a35e 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory mkdir -p constant/triSurface # copy DTC hull surface from resources folder -cp -f $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/DTC-scaled.stl.gz \ + constant/triSurface/ runApplication surfaceFeatureExtract @@ -14,10 +16,10 @@ runApplication blockMesh for i in 1 2 3 4 5 6 do - runApplication -s $i \ + runApplication -s "$i" \ topoSet -dict system/topoSetDict.${i} - runApplication -s $i \ + runApplication -s "$i" \ refineMesh -dict system/refineMeshDict -overwrite done diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/README b/tutorials/multiphase/interFoam/RAS/DTCHull/README.md similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/README rename to tutorials/multiphase/interFoam/RAS/DTCHull/README.md diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g index ebc62289ef..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef index aef0c2a31d..3c4a898906 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/hRef @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedScalarField; - location "constant"; object hRef; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 0 0 0 0 0]; value 0.244; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties index 5221f59d3b..136c7aeb33 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties index 4bdf335073..a8013f99c8 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict index 065ed34a37..3131f25e3a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict @@ -144,4 +144,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict index 6aeb7d950f..e6b3adcfa0 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,7 +44,6 @@ timePrecision 6; runTimeModifiable yes; - functions { forces diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes index 73acedca10..563ce386db 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution index 9d8fb11304..61beac8a12 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,17 +37,13 @@ solvers "pcorr.*" { solver PCG; - preconditioner { preconditioner GAMG; - smoother GaussSeidel; - tolerance 1e-5; relTol 0; }; - tolerance 1e-5; relTol 0; }; @@ -56,9 +51,7 @@ solvers p_rgh { solver GAMG; - smoother DIC; - tolerance 1e-7; relTol 0.01; }; @@ -72,10 +65,8 @@ solvers "(U|k|omega).*" { solver smoothSolver; - smoother symGaussSeidel; nSweeps 1; - tolerance 1e-7; relTol 0.1; minIter 1; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict index e208d6bab9..f10cf03628 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/meshQualityDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object meshQualityDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict index 4332d7eb4b..3e900d1c88 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict index 4d99651c4a..6d378d609b 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +45,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 index 9c19d43e09..ab4cb039dd 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 index 36a67e797a..b377138bf4 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 index 105572d2d6..02205590c7 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 index 95a455b655..c34cce6266 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 index 8c82990d7c..49a624dd6f 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 index 6edabfa073..7d459ce2f9 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water index b89ae971cb..b749015071 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k index 9c2d27a30f..484900850a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega index 03db58f8da..f314cf7128 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega @@ -51,5 +51,4 @@ boundaryField } - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh index 9c30eeb2f4..983a4ecdb7 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean index c3d9032c1a..93ba6c1a4a 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean @@ -7,7 +7,6 @@ cleanCase0 rm -f system/topoSetDict -# Remove surface and features rm -rf constant/triSurface rm -rf constant/extendedFeatureEdgeMesh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun index b1638d242a..439656a35e 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory mkdir -p constant/triSurface # copy DTC hull surface from resources folder -cp -f $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/ +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/DTC-scaled.stl.gz \ + constant/triSurface/ runApplication surfaceFeatureExtract @@ -14,10 +16,10 @@ runApplication blockMesh for i in 1 2 3 4 5 6 do - runApplication -s $i \ + runApplication -s "$i" \ topoSet -dict system/topoSetDict.${i} - runApplication -s $i \ + runApplication -s "$i" \ refineMesh -dict system/refineMeshDict -overwrite done diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/README b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/README.md similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/README rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/README.md diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g index ebc62289ef..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef index aef0c2a31d..3c4a898906 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/hRef @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedScalarField; - location "constant"; object hRef; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 0 0 0 0 0]; value 0.244; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties index 5221f59d3b..136c7aeb33 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties index 4bdf335073..a8013f99c8 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict index 065ed34a37..3131f25e3a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict @@ -144,4 +144,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict index 578923a209..0e81fe2d34 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 15; maxDeltaT 0.05; - functions { forces diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes index bce7b52324..25ba9d3dfe 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution index 11b975a2ca..8ee04f6348 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,9 +37,7 @@ solvers "pcorr.*" { solver GAMG; - smoother DIC; - tolerance 1e-3; relTol 0; }; @@ -48,9 +45,7 @@ solvers p_rgh { solver GAMG; - smoother DIC; - tolerance 5e-8; relTol 0; }; @@ -64,10 +59,8 @@ solvers "(U|k|omega).*" { solver smoothSolver; - smoother symGaussSeidel; nSweeps 1; - tolerance 1e-7; relTol 0; minIter 1; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict index 08a8efe62d..7bfee16de0 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/meshQualityDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object meshQualityDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict index 4332d7eb4b..3e900d1c88 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict index 4d99651c4a..6d378d609b 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,4 +45,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 index 9c19d43e09..ab4cb039dd 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 index 36a67e797a..b377138bf4 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 index 105572d2d6..02205590c7 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 index 95a455b655..c34cce6266 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 index 8c82990d7c..49a624dd6f 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 index 989cf47920..7d459ce2f9 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,9 +21,9 @@ actions type cellSet; action new; source boxToCell; - box (-0.5 -0.55 -0.15) (6.25 0 0.65); } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U index a2fc175281..37944f78e5 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/U @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water index 794df84a5b..0cd51bd008 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/alpha.water @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh index 222b175891..977347e9bc 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/0.orig/p_rgh @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions index 982a0146f5..7df9550adf 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict index 30a5eae53a..ade5ef4069 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 1; maxDeltaT 1; - functions { sTransport @@ -96,4 +94,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes index c5782af226..62d4027a50 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution index 447a7447e4..c86404824d 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,11 +51,7 @@ solvers solver GAMG; tolerance 5e-9; relTol 0.01; - smoother GaussSeidel; - - - maxIter 50; }; @@ -92,4 +87,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean index 26e52f3f9f..8aa080425e 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allclean @@ -8,12 +8,12 @@ loseCases="damBreakFine" for caseName in $keepCases do - (cd $caseName && foamCleanTutorials) + (cd "$caseName" && foamCleanTutorials) done for caseName in $loseCases do - removeCase $caseName + removeCase "$caseName" done #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun index 5f71730f0a..2d0b6b80c8 100755 --- a/tutorials/multiphase/interFoam/RAS/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/RAS/damBreak/Allrun @@ -13,13 +13,13 @@ setDamBreakFine () -e s/"23 42\(.*\) 1 1)"/"46 76\1 2 1)"/g \ -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \ -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \ - $blockMeshDict > temp.$$ - mv temp.$$ $blockMeshDict + "$blockMeshDict" > temp.$$ + mv -f temp.$$ "$blockMeshDict" sed \ -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \ -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \ - $controlDict > temp.$$ - mv temp.$$ $controlDict + "$controlDict" > temp.$$ + mv -f temp.$$ "$controlDict" } # Do damBreak diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water index 81ca6599f6..721ca60115 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/alpha.water @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda index 1c79d05e94..84ae555389 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/nuTilda @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties index 89844d9793..f113b8d407 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; -density variable; +density variable; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict index ffff8455b6..472dac9be2 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes index d923b9d1a2..69508dc404 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution index ac49c0b266..98dda72968 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -80,4 +79,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict index 9962581b7e..804fd6506c 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict index 8eb1d80593..0de6747b10 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/changeDictionaryDict @@ -41,4 +41,5 @@ p_rgh } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict index 51377d0a62..438b51fc2c 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes index 502ea2e3a4..5523159135 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution index 17655ee254..725b4caad4 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -80,4 +79,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict index 9962581b7e..804fd6506c 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict index 032c02f632..b2b9bd193d 100644 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -44,4 +43,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh index 167c9ba977..72a4f202ac 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun index 76d3c8b003..e13100a35f 100755 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun @@ -5,11 +5,16 @@ cd "${0%/*}" || exit # Run from this directory canCompile || exit 0 # Dynamic code -runApplication blockMesh -runApplication topoSet -runApplication subsetMesh -overwrite c0 -patch floatingObject restore0Dir + +runApplication blockMesh + +runApplication topoSet + +runApplication subsetMesh -overwrite c0 -patch floatingObject + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties index 17cc291833..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict index 7baa7d1f47..cd0fa0b421 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/blockMeshDict @@ -70,4 +70,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict index 2a834a0f93..3b9078c831 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ maxAlphaCo 1; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes index c0ba81f146..4a12b7b53e 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution index a0b06fbef7..b17bcb8bcc 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,7 +43,6 @@ solvers smoother DICGaussSeidel; cacheAgglomeration no; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -70,7 +68,6 @@ solvers smoother DICGaussSeidel; nPreSweeps 2; } - tolerance 1e-8; relTol 0; maxIter 20; diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict index 25bd734223..a9d384c5ce 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict index 8a85e64a7f..96c6e5dc70 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/topoSetDict @@ -31,4 +31,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U index de03bab405..859b8a51a2 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U; } diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water index d80369583e..0df6fab284 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k index 8a5eeb1265..8a0fed09b8 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut index 42622fb199..92d1f86f97 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh index 113b32e684..1ba7281c26 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre index be2f18b340..986ec4e550 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre @@ -3,14 +3,15 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -mkdir -p constant/triSurface +mkdir -p constant # copy STL files from resources folder -cp -f $FOAM_TUTORIALS/resources/geometry/mixerVesselAMI/* constant/triSurface/. +cp -rf \ + "$FOAM_TUTORIALS"/resources/geometry/mixerVesselAMI \ + constant/triSurface rm -rf 0 -# Meshing runApplication blockMesh runApplication surfaceFeatureExtract diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict index 3345171612..bea602c932 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties index a85ff2611e..7ca833f1a2 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties index 18ba965f85..f17089fda5 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict index ad93dc0906..950bfbd049 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/blockMeshDict @@ -54,4 +54,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict index fbd7680909..47a0d7176a 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ maxAlphaCo 1; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes index 06074e5837..e876c4221e 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,4 +54,5 @@ snGradSchemes default limited corrected 0.33; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution index fbbbe1bc15..b6883f8791 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict index 977727ebe4..1733da981d 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict index 69a67228c8..256d457871 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict @@ -564,4 +564,5 @@ meshQualityControls // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water index 5ec2035a14..6109391692 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/alpha.water @@ -35,4 +35,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k index 14f65ba785..3db4d86635 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/k @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega index e21a5da04c..72c30c576c 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega +++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/omega @@ -38,5 +38,4 @@ boundaryField } - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh index 067d99d6fc..15b12b7881 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/motorBike/0.orig/p_rgh @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre index b10bd4698d..8242ba306c 100755 --- a/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre +++ b/tutorials/multiphase/interFoam/RAS/motorBike/Allrun.pre @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory mkdir -p constant/triSurface # copy motorbike surface from resources directory -cp -f $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/motorBike.obj.gz \ + constant/triSurface/ runApplication surfaceFeatureExtract diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict index f28c2b327a..746488cba6 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/g +++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties index 0ba1d6aa5f..a8013f99c8 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/motorBike/constant/turbulenceProperties @@ -10,20 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kOmegaSST; + RASModel kOmegaSST; - turbulence on; + turbulence on; - printCoeffs on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict index 74733172ea..08f3c41173 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/blockMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // scale 1; @@ -86,4 +85,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict index 47806a3616..81c45e7281 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +54,6 @@ maxDeltaT 1; functions { - // Print stats #include "minMax" } diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite index 820fa72c68..bbc3004338 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_nextWrite @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run index 47806a3616..81c45e7281 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/controlDict_run @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +54,6 @@ maxDeltaT 1; functions { - // Print stats #include "minMax" } diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes index 9d64c7889b..752e2bc10b 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +51,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution index a29895a40d..1879ae3e0f 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax index fd5005b9eb..71399c494d 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/minMax @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object minMax; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,4 +33,5 @@ minMax ); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict index c2417b6e2e..1fa91b25c5 100644 --- a/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/motorBike/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,8 +24,6 @@ regions ( boxToCell { - //box ( -1 -0.5 0 ) ( -0.5 0.5 2 ); - //box ( -0.5 -0.5 1.5 ) ( 1.5 0.5 2 ); box ( 0 -0.5 1.5 ) ( 2 0.5 1.75 ); fieldValues ( diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water index 54fb6cf07d..ad8a908267 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/alpha.water @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k index 96ad5e7a36..4cbc0fea64 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/k @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega index b99b12d827..533d851961 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/omega @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh index ac9231ad19..1ce0403465 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/p_rgh @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s index c9eff3eedf..a76149c589 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/0.orig/s @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g index ebc62289ef..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties index 4bdf335073..a8013f99c8 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict index 36a979a0d4..bbec6acd0d 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/blockMeshDict @@ -94,4 +94,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict index abb8a5f4e7..cbfca42d2b 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 6; maxDeltaT 1; - functions { inletFlux @@ -124,4 +122,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict index a3468367ef..89866c42c9 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict @@ -33,4 +33,5 @@ linearDirectionCoeffs mergeFaces false; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 index dfbda2fbfb..4744be49a2 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.1 @@ -33,4 +33,5 @@ linearDirectionCoeffs mergeFaces false; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 index a3468367ef..89866c42c9 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/extrudeMeshDict.2 @@ -33,4 +33,5 @@ linearDirectionCoeffs mergeFaces false; -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes index 56d737affe..217ad0ff38 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +56,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution index 6b9641f109..7622a91b86 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,11 +51,7 @@ solvers solver GAMG; tolerance 5e-9; relTol 0.01; - smoother GaussSeidel; - - - maxIter 50; }; diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict index f096778dc0..72a1720616 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U index 8cf77cb136..0417b2f6cd 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U @@ -52,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water index 08b2dbad12..135a642dfb 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut index 68921fd77c..058888ec6c 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut @@ -25,16 +25,19 @@ boundaryField type calculated; value uniform 0; } + outlet { type calculated; value uniform 0; } + lowerWall { type nutkWallFunction; value uniform 0; } + atmosphere { type calculated; diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh index 417ba4aaad..adcc898457 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict index 3b4a59abd3..63f1917685 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/blockMeshDict @@ -90,4 +90,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict index 43467c22af..a989aeff58 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ maxAlphaCo 0.2; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes index edbcdb041e..59bca45058 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict index 331b1fc0b5..9584d9053f 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/setFieldsDict @@ -32,4 +32,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun index b731754818..cc36822e88 100755 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun @@ -3,9 +3,12 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -runApplication blockMesh restore0Dir + +runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g index d43697de04..528f720d08 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties index c987696a1c..a97c7bad47 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict index 74e4dbfd21..2ccb7991e6 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes index a2fda5bfa4..43279597fc 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSchemes @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // ddtSchemes { - default Euler; + default Euler; } gradSchemes @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss upwind; + div(rhoPhi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution index 327bb1a585..7c6ddc8f77 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict index d967dbe232..728413bcb9 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean index 26e52f3f9f..8aa080425e 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/Allclean +++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allclean @@ -8,12 +8,12 @@ loseCases="damBreakFine" for caseName in $keepCases do - (cd $caseName && foamCleanTutorials) + (cd "$caseName" && foamCleanTutorials) done for caseName in $loseCases do - removeCase $caseName + removeCase "$caseName" done #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun index 05e7a0ad9d..2870598d16 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreak/Allrun @@ -14,12 +14,12 @@ setDamBreakFine () -e s/"4 42\(.*\) 1 1)"/"4 76\1 2 1)"/g \ -e s/"19 42\(.*\) 1 1)"/"40 76\1 2 1)"/g \ $blockMeshDict > temp.$$ - mv temp.$$ $blockMeshDict + mv -f temp.$$ $blockMeshDict sed \ -e s/"\(deltaT[ \t]*\) 0.001;"/"\1 5e-04;"/g \ -e s/"\(endTime[ \t]*\) 1;"/"\1 0.4;"/g \ $controlDict > temp.$$ - mv temp.$$ $controlDict + mv -f temp.$$ $controlDict } # Do damBreak diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water index 81ca6599f6..721ca60115 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/alpha.water @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun index 01eb91b884..cc36822e88 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allrun @@ -4,8 +4,11 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties index 58a9f54c86..4751f65418 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict index 3aa6beb9dd..5ac0620ac9 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,4 +54,5 @@ maxDeltaT 1; #sinclude "sampling" + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes index a57cabdd20..ff9938fccf 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss linearUpwind grad(U); + div(rhoPhi,U) Gauss linearUpwind grad(U); div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss linear; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution index 435e82b830..3d3ae2b914 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling index f1d86f91c0..b9428ae3ab 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling @@ -51,4 +51,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict index 9962581b7e..804fd6506c 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water index b19e91c567..19794e2f8d 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k index 2a06078868..ba49a24ea5 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega index ea794bf451..9f62360de7 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega @@ -35,5 +35,4 @@ boundaryField } - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh index a85fb3cad3..5299e2469b 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun index 1cbd09d70a..428597cb08 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun @@ -4,10 +4,15 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + runApplication blockMesh + runApplication topoSet + runApplication subsetMesh -overwrite c0 -patch walls + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict index 0f852902f6..5ad68e3b9d 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict index 572f7d27a4..8e9e650f4d 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/blockMeshDict @@ -65,4 +65,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict index 4334c542ea..74a51ea3fa 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict index 9c3640dcca..819830315b 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/decomposeParDict @@ -18,4 +18,5 @@ numberOfSubdomains 6; method scotch; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes index 439e535bf1..7f77bdd288 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +51,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution index 18fa645c5f..2c5e371e1e 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict index aa61cf6845..6d28956273 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict index 12c2c0754d..35986158a5 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // actions @@ -36,4 +35,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water index be2c17e6a8..823204793b 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/alpha.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh index 9b420c815b..67bd9687ef 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/0.orig/p_rgh @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre index 9d3d4a8a37..3dd269fcca 100755 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties index 43b9d83924..58fd56d294 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 6.2831853; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g index aa97844247..5934e5cfd7 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties index a1353b43ef..36a69a79f2 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water oil); +phases (water oil); water { diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict index 79a1d2d9ca..65a8c00e18 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes index 50198586ac..c10e722212 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution index ab4d461472..0edacd1e7c 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict index e80ff4b1c1..4268bb1969 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U index 10d30af247..1b1b865dbc 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/U @@ -29,4 +29,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water index 8b27893bcd..37c9673024 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/alpha.water @@ -28,4 +28,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh index 4873a9a85e..4ed9694313 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/0.orig/p_rgh @@ -28,4 +28,5 @@ boundaryField #includeEtc "caseDicts/setConstraintTypes" } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean index 21a3ef143c..64e0b6245f 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean @@ -5,7 +5,6 @@ cd "${0%/*}" || exit # Run from this directory cleanCase0 -# Remove surface and features rm -rf constant/triSurface rm -rf constant/extendedFeatureEdgeMesh diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun index 9040147a82..07f4092bb6 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allrun @@ -3,13 +3,14 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -restore0Dir - mkdir -p constant/triSurface -cp -f $FOAM_TUTORIALS/resources/geometry/sloshingCylinder.obj.gz \ +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/sloshingCylinder.obj.gz \ constant/triSurface/ +restore0Dir + runApplication blockMesh runApplication snappyHexMesh -overwrite diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict index 995165dbed..5279a7a4ad 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties index 329748eb56..eb9a504ed7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0.07; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict index b0e98f9d8b..083ee5ad10 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict @@ -91,4 +91,5 @@ boundary ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict index 4b24c8a9f5..a45cf01b46 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes index a9c66d982c..953a57921f 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution index deda89f438..6320788b1d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -72,7 +71,6 @@ PIMPLE nCorrectors 2; nNonOrthogonalCorrectors 1; correctPhi no; - pRefPoint (0 0 0); pRefValue 1e5; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict index 60f2158bac..5d780ddde4 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/meshQualityDict @@ -16,4 +16,5 @@ FoamFile #includeEtc "caseDicts/mesh/generation/meshQualityDict.cfg" + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict index 2dbbf1db63..4a782c5180 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict index 673ff332ed..b8b9bca3df 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict @@ -80,4 +80,5 @@ writeFlags mergeTolerance 1e-6; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U index f4400b92b9..8aae30e0ed 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/U @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water index be5471701c..aca52b40d6 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/alpha.water @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh index 2e5c06a458..8eaf0a1284 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/0.orig/p_rgh @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun index b7ffa9ddce..71fee596c5 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allrun @@ -4,9 +4,12 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict index 5c1363c36f..a79cc4085d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties index a0163959c3..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict index d219ee8cb5..6a6c59d18d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict index df13f4e670..d569ffffc0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 3 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution index 1765a14ca3..aae92e9174 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -83,7 +82,6 @@ PIMPLE nCorrectors 2; nNonOrthogonalCorrectors 0; correctPhi no; - pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U index f4400b92b9..8aae30e0ed 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/U @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water index be5471701c..aca52b40d6 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/alpha.water @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh index 2e5c06a458..8eaf0a1284 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/0.orig/p_rgh @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun index b7ffa9ddce..71fee596c5 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allrun @@ -4,9 +4,12 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict index 02b17418b0..bc1b4b60db 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties index 17cc291833..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict index d219ee8cb5..6a6c59d18d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict index df13f4e670..d569ffffc0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 3 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution index 1765a14ca3..aae92e9174 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -83,7 +82,6 @@ PIMPLE nCorrectors 2; nNonOrthogonalCorrectors 0; correctPhi no; - pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U index 62323e5e39..1970ae7d0a 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/U @@ -27,4 +27,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water index 632a2df297..0e29bb264d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/alpha.water @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh index e550218822..1d0fd3aaea 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/0.orig/p_rgh @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun index b7ffa9ddce..71fee596c5 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allrun @@ -4,9 +4,12 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict index 5c1363c36f..a79cc4085d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties index a0163959c3..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict index b8044a7e62..8be7682779 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict index ad85180cd9..5846a3813f 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (4 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution index 1765a14ca3..80d090994d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U index 62323e5e39..1970ae7d0a 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/U @@ -27,4 +27,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water index 632a2df297..0e29bb264d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/alpha.water @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh index e550218822..1d0fd3aaea 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/0.orig/p_rgh @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun index b7ffa9ddce..71fee596c5 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allrun @@ -4,9 +4,12 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict index 02b17418b0..bc1b4b60db 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties index 17cc291833..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict index adeddd1d1a..68edde4867 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict index ad85180cd9..5846a3813f 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (4 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution index 1765a14ca3..80d090994d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U index 62323e5e39..1970ae7d0a 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/U @@ -27,4 +27,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water index 632a2df297..0e29bb264d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/alpha.water @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh index e550218822..1d0fd3aaea 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/0.orig/p_rgh @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun index b7ffa9ddce..71fee596c5 100755 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allrun @@ -4,9 +4,12 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + m4 system/blockMeshDict.m4 > system/blockMeshDict runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict index 4e4de53a3c..c1b3664a83 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties index a0163959c3..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -33,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict index adeddd1d1a..68edde4867 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict index ad85180cd9..5846a3813f 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (4 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution index 1765a14ca3..80d090994d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U index 62323e5e39..1970ae7d0a 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/U @@ -27,4 +27,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water index 632a2df297..0e29bb264d 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/alpha.water @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh index e550218822..1d0fd3aaea 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/0.orig/p_rgh @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun index 01eb91b884..cc36822e88 100755 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allrun @@ -4,8 +4,11 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ restore0Dir + runApplication blockMesh + runApplication setFields + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict index 3573fd5d93..607fa7b7b4 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties index 17cc291833..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict index 686698de03..d0945691d3 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict index ad85180cd9..5846a3813f 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (4 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes index a9c66d982c..c2b37a723c 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss vanLeer; div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; @@ -48,4 +47,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution index ae33ddbdeb..9c795481eb 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict index c04816471c..0aef22e871 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U index 60ec27bd7d..1e5c481e92 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water index 5c4a181206..c421844244 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/alpha.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object alpha.water; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh index ce39087eea..f7b84011f4 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/0.orig/p_rgh @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object p_rgh; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun index e3b61a0f14..b10aff3e94 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/Allrun @@ -4,16 +4,24 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh -runApplication -s createBlockage topoSet -dict system/topoSetDict.createBlockage + +runApplication -s createBlockage \ + topoSet -dict system/topoSetDict.createBlockage + runApplication subsetMesh -overwrite blockage -patch bottom -runApplication -s createPatch topoSet -dict system/topoSetDict.createPatch -runApplication -s createCollector topoSet -dict system/topoSetDict.createCollector + +runApplication -s createPatch \ + topoSet -dict system/topoSetDict.createPatch + +runApplication -s createCollector \ + topoSet -dict system/topoSetDict.createCollector restore0Dir runApplication decomposePar runParallel setFields + runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties index 5c5a9b7a5e..15c0d5bd12 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict index 98db7243e7..887c491d9b 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/blockMeshDict @@ -72,4 +72,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict index 61d3e40010..789599f161 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 1; maxDeltaT 1; - functions { extractEulerianParticles1 diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes index 29ccd9c080..0c69d453d4 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution index 379628c616..c39bc0ba56 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict index f87b10535e..6917ef25e5 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector index 43a9ebe6e5..27aac59a28 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createCollector @@ -34,4 +34,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch index a82bdb8eec..2f5880d4cc 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/eulerianInjection/system/topoSetDict.createPatch @@ -48,4 +48,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 index 7b47877d44..992a995fe4 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/N2 @@ -12,18 +12,19 @@ FoamFile class volScalarField; object N2; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.766; +internalField uniform 0.766; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 index 7c7bc687b8..071749dd8b 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/O2 @@ -12,18 +12,19 @@ FoamFile class volScalarField; object O2; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.234; +internalField uniform 0.234; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T index b17f99cc70..78b0c62c6b 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/T @@ -12,18 +12,19 @@ FoamFile class volScalarField; object T; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 293; +internalField uniform 293; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U index ec65053cf5..16bc344204 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/U @@ -12,19 +12,20 @@ FoamFile class volVectorField; object U; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 1 -1 0 0 0 0]; +dimensions [0 1 -1 0 0 0 0]; -internalField uniform (0 0 0); +internalField uniform (0 0 0); boundaryField { walls { - type fixedValue; - value uniform (0 0 0); + type fixedValue; + value uniform (0 0 0); } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault index 999bbcefaf..835daddcef 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/Ydefault @@ -12,18 +12,19 @@ FoamFile class volScalarField; object Ydefault; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; +internalField uniform 0; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat index 97df3fd4c4..36e72aa4e9 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/alphat @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object alphat; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon index 4d9b0213d1..f553bc4867 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object epsilon; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k index ed075a9314..68fb0923c3 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object k; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut index eeaa005904..0b9465face 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/nut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object nut; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p index 4025036b9e..ac7ffa751d 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/0.orig/p @@ -12,11 +12,11 @@ FoamFile class volScalarField; object p; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 101325; +internalField uniform 101325; boundaryField { @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun index 9bec2595a8..8dc8ad497d 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/Allrun @@ -34,8 +34,8 @@ copyLagrangianData() if [ -d $dir ] then echo "Copying lagrangian data from $ldir to 0 directory" - \cp -r $ldir 0 - mkdir 0/uniform && \cp -r $udir 0/uniform + cp -rf $ldir 0 + mkdir 0/uniform && cp -rf $udir 0/uniform else echo "Error: unable to find Lagrangian data in case $ldir" exit 1 @@ -43,7 +43,7 @@ copyLagrangianData() } -restore0Dir; +restore0Dir copyLagrangianData ${eulerianCase} diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties index 9f9ae1f2d2..7c18c53a42 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties index bcafaf4d7e..1d66061fb5 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g index 111080ed5d..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/g @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties index 25af756820..8c8b493270 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/sprayCloudProperties @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object sprayCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties index 20cf0a5cc2..1335d6bd36 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,4 +75,5 @@ liquids solids {} + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties index 0a31cf3214..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/constant/turbulenceProperties @@ -8,14 +8,13 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict index b69932d601..2014e5f310 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/blockMeshDict @@ -54,4 +54,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict index d6a4a32b4f..e6dfc7ac1f 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/controlDict @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application sprayFoam; -startFrom latestTime; // startTime; +startFrom latestTime; startTime 0; diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes index 413db0e50a..f79c140957 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution index 5ed26a4684..05dd2ddaf3 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianDistributionInjection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -98,4 +97,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 index 7b47877d44..992a995fe4 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/N2 @@ -12,18 +12,19 @@ FoamFile class volScalarField; object N2; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.766; +internalField uniform 0.766; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 index 7c7bc687b8..071749dd8b 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/O2 @@ -12,18 +12,19 @@ FoamFile class volScalarField; object O2; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0.234; +internalField uniform 0.234; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T index b17f99cc70..78b0c62c6b 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/T @@ -12,18 +12,19 @@ FoamFile class volScalarField; object T; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 0 1 0 0 0]; -internalField uniform 293; +internalField uniform 293; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U index ec65053cf5..16bc344204 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/U @@ -12,19 +12,20 @@ FoamFile class volVectorField; object U; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 1 -1 0 0 0 0]; +dimensions [0 1 -1 0 0 0 0]; -internalField uniform (0 0 0); +internalField uniform (0 0 0); boundaryField { walls { - type fixedValue; - value uniform (0 0 0); + type fixedValue; + value uniform (0 0 0); } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault index 999bbcefaf..835daddcef 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/Ydefault @@ -12,18 +12,19 @@ FoamFile class volScalarField; object Ydefault; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 0 0 0 0 0 0]; -internalField uniform 0; +internalField uniform 0; boundaryField { walls { - type zeroGradient; + type zeroGradient; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat index 97df3fd4c4..36e72aa4e9 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/alphat @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object alphat; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon index 4d9b0213d1..f553bc4867 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object epsilon; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k index ed075a9314..68fb0923c3 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object k; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut index eeaa005904..0b9465face 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/nut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object nut; } diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p index 4025036b9e..ac7ffa751d 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/0.orig/p @@ -12,11 +12,11 @@ FoamFile class volScalarField; object p; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [1 -1 -2 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 101325; +internalField uniform 101325; boundaryField { @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun index 9bec2595a8..e35bd8e745 100755 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/Allrun @@ -34,8 +34,8 @@ copyLagrangianData() if [ -d $dir ] then echo "Copying lagrangian data from $ldir to 0 directory" - \cp -r $ldir 0 - mkdir 0/uniform && \cp -r $udir 0/uniform + cp -rf $ldir 0 + mkdir 0/uniform && cp -rf $udir 0/uniform else echo "Error: unable to find Lagrangian data in case $ldir" exit 1 diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties index 9f9ae1f2d2..7c18c53a42 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/chemistryProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties index bcafaf4d7e..1d66061fb5 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/combustionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g index 111080ed5d..28b07d0b87 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/g @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties index 791460502c..6766c9f953 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/radiationProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object radiationProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties index 1e0af721fc..796093d2a7 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/sprayCloudProperties @@ -8,9 +8,8 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object sprayCloudProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties index 20cf0a5cc2..1335d6bd36 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/thermophysicalProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,4 +75,5 @@ liquids solids {} + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties index 0a31cf3214..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/constant/turbulenceProperties @@ -8,14 +8,13 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict index b69932d601..2014e5f310 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/blockMeshDict @@ -54,4 +54,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict index d6a4a32b4f..e6dfc7ac1f 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/controlDict @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application sprayFoam; -startFrom latestTime; // startTime; +startFrom latestTime; startTime 0; diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict index 8f4899af2f..facb2d6e4e 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes index 413db0e50a..f79c140957 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution index 5ed26a4684..05dd2ddaf3 100644 --- a/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/vofToLagrangian/lagrangianParticleInjection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -98,4 +97,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties index 27474bf84c..42f8289931 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict index 6571348e58..f018ab73fb 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict index e6ebe50018..1da8e0814e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict index 2f11f3b41d..7bc80051e0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U index 2391c3d9ab..bfb0cebb43 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/U @@ -55,4 +55,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water index 5718e07f64..7ef82c7d75 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/0.orig/alpha.water @@ -54,4 +54,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties index 3f951b0d05..7df4019c92 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict index 296be769e0..5ba9577fce 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/blockMeshDict @@ -93,4 +93,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict index 449f225305..a679cdd888 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict index f8b2b572bd..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/decomposeParDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object decomposeParDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // numberOfSubdomains 2; @@ -24,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution index 5a4621b074..93f5e6999c 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict index 431b8f0509..77f5212212 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex index 7af2e76f8d..9a4d300dbf 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/MangrovesIndex @@ -26,4 +26,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U index 2bdfb7fd57..ca2846d414 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/U @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water index 8de29dccfd..a118150eff 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties index 3c91f6f349..926cc75bd3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties index eb88113a87..7b627c46bf 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,4 +38,5 @@ right nPaddle 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict index 4ae2c77fab..0e7182b189 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict index e3607abcb4..8e70940bf4 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -158,4 +157,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions index e6db5d5ba9..deb09cbc9d 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,4 +58,5 @@ TurbulenciaMangroves } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes index d39cd3bea8..4e8f4ff17b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution index e9ad1e020b..20496a6ea3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict index c60d1ca444..d83f936c7c 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict index ac0921c828..48ea53997f 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/topoSetDict @@ -28,4 +28,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties index 3c91f6f349..926cc75bd3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties index e9a91881a9..09f5c313a7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict index f50f47536a..9f408adddc 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict index 066287f6e8..62de4ebb1e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict index d6d25ade47..3a48eebaa2 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U index 2bdfb7fd57..ca2846d414 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/U @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water index 8de29dccfd..a118150eff 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties index 3c91f6f349..926cc75bd3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties index 3280af9f33..8f0c866832 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,4 +38,5 @@ right nPaddle 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict index b81840bcce..8c04bb7a6c 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict index 96f12807a7..9389a10a7b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict index bb5f1a00cf..87d6ce5868 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U index 2bdfb7fd57..ca2846d414 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/U @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water index 8de29dccfd..a118150eff 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties index 3c91f6f349..926cc75bd3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties index 7dd9e5d81b..be73af8a55 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,4 +38,5 @@ right nPaddle 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict index b81840bcce..8c04bb7a6c 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict index 061bf8f19e..52c0e356a0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict index bb5f1a00cf..87d6ce5868 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties index 11a54d14c0..894321a96c 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict index 3bd8e6dc6f..46b4643f05 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict index 60dafb468d..ddb56a5171 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict index f56fe76957..23320c8882 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties index 0a654e28fd..a5e4f84e6e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict index ba18bfecbc..94c2885376 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict index 0400ebc67a..f25a7a2507 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict index 2f11f3b41d..7bc80051e0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties index 6d3344991a..9578ce54f1 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict index 6571348e58..f018ab73fb 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict index 81df529f31..a99c2d74d0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict index 2f11f3b41d..7bc80051e0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties index 0fc1a253c6..74b4d89315 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict index 5177f8d76b..0eb3b2b67a 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict index d4f849f79f..2a978090c3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes index d92faf4ca3..ea446f6b84 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution index 5c53b81a26..01f551af4e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict index ad53914da3..7c6ac00b78 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U index c428c6be4b..dd4d975271 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/U @@ -61,4 +61,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water index 6409acaf0a..f4e57d9d50 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/alpha.water @@ -58,4 +58,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh index 651c7ea402..a222cbdd76 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/0.orig/p_rgh @@ -67,4 +67,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties index fe643fe630..d0c6b889d4 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object wavesProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict index 361c85b4ac..369de23dfb 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/blockMeshDict @@ -107,4 +107,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict index 65b4dcedcd..e5297bac74 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict index bfa38f257d..c4ba64fdf2 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,4 +23,5 @@ coeffs n (4 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes index 0a0d528759..8c4cc3d2b8 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution index 7c19db7aef..80f199419e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict index 872c696c2c..c255964c18 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U index 64aea071e5..7388a641e2 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/U @@ -61,4 +61,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water index 0e419fc326..0b0e554036 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/alpha.water @@ -58,4 +58,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh index f1c36ddffa..a6d2c0bc53 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/0.orig/p_rgh @@ -69,4 +69,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties index 749c142a91..09cd8fb0e1 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object wavesProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict index 1cefaa8139..27d3b119ae 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/blockMeshDict @@ -107,4 +107,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict index 232f2853aa..6f6f182077 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict index c0a21d0a6a..b43f911109 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes index 0a0d528759..8c4cc3d2b8 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution index db477ec7d9..74af7fb147 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict index 872c696c2c..c255964c18 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U index 64aea071e5..7388a641e2 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/U @@ -61,4 +61,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water index 0e419fc326..0b0e554036 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/alpha.water @@ -58,4 +58,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh index f1c36ddffa..a6d2c0bc53 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/0.orig/p_rgh @@ -69,4 +69,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties index 749c142a91..09cd8fb0e1 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object wavesProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict index 7d5fec4780..f2feff9fc5 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/blockMeshDict @@ -109,4 +109,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict index 4490692640..8547c84721 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict index c0a21d0a6a..b43f911109 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes index 0a0d528759..8c4cc3d2b8 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution index db477ec7d9..74af7fb147 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict index 872c696c2c..c255964c18 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U index c428c6be4b..dd4d975271 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/U @@ -61,4 +61,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water index 6409acaf0a..f4e57d9d50 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/alpha.water @@ -58,4 +58,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh index 651c7ea402..a222cbdd76 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/0.orig/p_rgh @@ -67,4 +67,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties index fe643fe630..d0c6b889d4 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object wavesProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict index 4ed08354b2..3663e63122 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/blockMeshDict @@ -109,4 +109,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict index 26c89d24ff..e5297bac74 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict index bfa38f257d..c4ba64fdf2 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/decomposeParDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,4 +23,5 @@ coeffs n (4 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes index 0a0d528759..8c4cc3d2b8 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution index 7c19db7aef..80f199419e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict index 872c696c2c..c255964c18 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U index c6bc4d91e0..04e4be73c7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/U @@ -77,4 +77,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water index 7282544806..e3c07bfdc9 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/0.orig/alpha.water @@ -75,4 +75,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict index eede33a4e4..1f799ea85a 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/dynamicMeshDict @@ -24,4 +24,5 @@ displacementLaplacianCoeffs diffusivity inverseDistance (inlet); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g index 2f85d79da8..06ba6d0e67 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 -9.81); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties index 3c91f6f349..926cc75bd3 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties index ff1ff77177..a3e14e163f 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties index 863660ab8c..4535e81910 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object wavesProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict index 4451b9aeb6..0f7e167e65 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/blockMeshDict @@ -131,4 +131,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict index 747be5d959..686e0ab678 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { lineMOVING diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict index 7eb7c77b03..c85271feab 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/decomposeParDict @@ -25,4 +25,5 @@ coeffs order xyz; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes index eaf0374bb9..d222f247ea 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,7 @@ snGradSchemes wallDist { - method meshWave; + method meshWave; } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution index 79a1423a5a..09ba23d7d5 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict index b46a45a339..bfd280900f 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air index bb57c049cb..8217082955 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.air @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other index 12c7dcee1c..a4b0acdef6 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.other @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water index 81ca6599f6..721ca60115 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/alpha.water @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties index 191eaa99fc..90916d4255 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air other water); +phases (air other water); air { @@ -45,4 +44,5 @@ sigma13 0.04; // Diffusivity between miscible phases D23 3e-09; + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties index c248a5b18b..b49f4275d4 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict index 6ffe9afaa1..5f7eda3545 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes index 1aa6886be2..3178781ce1 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution index a5acbc99b9..67babf8bea 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict index 1b24cdd988..6c3537469d 100644 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water index 93e6d6bc81..16d541c822 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun index c8ee365d67..b9af8787b2 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun @@ -5,7 +5,6 @@ cd "${0%/*}" || exit # Run from this directory ./Allrun.pre -# apply the initial fields restore0Dir runApplication decomposePar diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre index 39c8c2af97..584d1282cc 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre @@ -3,12 +3,13 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -mkdir -p constant/triSurface +mkdir -p constant # copy propeller surface from resources directory -cp -f $FOAM_TUTORIALS/resources/geometry/propeller/* constant/triSurface/ +cp -rf \ + "$FOAM_TUTORIALS"/resources/geometry/propeller \ + constant/triSurface -# meshing runApplication blockMesh runApplication surfaceFeatureExtract diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict index dcf7e3a079..661ecc8181 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties index a3d34576c4..bd3b9de227 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/transportProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water vapour); +phases (water vapour); phaseChangeTwoPhaseMixture SchnerrSauer; @@ -61,4 +60,5 @@ SchnerrSauerCoeffs Cv 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties index 812822fc79..b9b70921b6 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/turbulenceProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict index dbd68906ff..e4e2184817 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/blockMeshDict @@ -68,4 +68,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict index 5050883d56..c0f860534b 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 2; maxAlphaCo 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict index 54c4ec165c..5f8fe411f8 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createInletOutletSets.topoSetDict @@ -59,4 +59,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict index 4d36050633..770f2c16b4 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/createPatchDict @@ -70,4 +70,5 @@ patches } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes index bca0429cb9..1bb6c0dad7 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution index c494ff0931..3c2730ed10 100644 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/fvSolution @@ -91,4 +91,5 @@ cache grad(U); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi index 5d1c2bf015..495051bcdb 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U index 775cc3a3e7..d94be683ae 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water index 5341dd4ddd..3d60945155 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh index 2174eae0c1..0412032351 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun index a8b6a58e87..72148a84fe 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun @@ -6,7 +6,9 @@ cd "${0%/*}" || exit # Run from this directory mkdir -p constant/triSurface # Copy bullet surface from resources directory -cp -f $FOAM_TUTORIALS/resources/geometry/bullet.stl.gz constant/triSurface/ +cp -f \ + "$FOAM_TUTORIALS"/resources/geometry/bullet.stl.gz \ + constant/triSurface/ # Generate the base block mesh runApplication blockMesh diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties index f9f44ac51e..ff5f078a52 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water vapour); +phases (water vapour); phaseChangeTwoPhaseMixture SchnerrSauer; @@ -39,7 +39,7 @@ vapour KunzCoeffs { UInf U20.0; - tInf t0.005; // L = 0.1 m + tInf 0.005; // L = 0.1 m Cc C1000; Cv C1000; } diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air index c6978c03c6..c080ee403c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water index f9358a19ee..e8c1e86d55 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air index 6cf43c988b..309c389fe7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water index 7eae197b6c..9da0789be8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/alpha.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh index dfd9b49617..278565acee 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0.orig/p_rgh @@ -38,4 +38,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties index 07c95bf30e..70063c4b08 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict index d8c094f1e8..e53a41bd24 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes index 8894df1c00..de3cd34b6a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,4 +51,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution index 50a7f23fa6..1564e8a5bb 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict index 20048d87d0..119282004c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh index bc8a434df8..0f153f4869 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh @@ -52,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties index c96db87002..d285821e5b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/motionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object motionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties index e4abe802bd..8015c5ce7b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict index 3674325224..ef3c2475ac 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes index abae360431..204c4118de 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution index 1e601fbe8a..405247dcbd 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,4 +80,5 @@ relaxationFactors "U.*" 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict index 354cada94e..4dcccd460a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties index c96db87002..d285821e5b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/motionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object motionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties index e4abe802bd..8015c5ce7b 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict index 0aedb5728a..a12022706d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict index 349df11535..b62ebfafb3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes index abae360431..204c4118de 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution index 1e601fbe8a..405247dcbd 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,4 +80,5 @@ relaxationFactors "U.*" 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict index 354cada94e..4dcccd460a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta index 40b638f90e..595db950a4 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/Theta @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air index ba293edd3d..2494e439c3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury index 48629a1635..48f22f53ab 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.mercury @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil index 06facc0cef..0ffc609d16 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.oil @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water index eebc0e51a4..9887ac49d7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/U.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air index c884f91b74..f26e7cfcda 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury index bebc8bb074..35046693ee 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.mercury @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil index b7026e2fb9..225de14f92 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.oil @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water index 2434f0a712..3aecb1de6a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/alpha.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh index d2b21c250e..30296f00f8 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0.orig/p_rgh @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre index 9d3d4a8a37..3dd269fcca 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties index d16670a97a..498dc68b66 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; + object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +28,5 @@ MRF1 omega constant 10.472; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties index 8fd7419f48..6da83cde3e 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/interfacialProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object interfacialProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,4 +26,5 @@ dragPhase blended; residualSlip 1e-2; minInterfaceAlpha 1e-3; + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties index 8ceef8d0e3..9f5b0b5f9d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict index 4577e82e46..13ad3019d9 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes index abae360431..204c4118de 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution index 9db5029868..2c467ae617 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,4 +84,5 @@ relaxationFactors "U.*" 1; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas index 7570594a85..2c4d4cc5d3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,18 +24,22 @@ boundaryField { type zeroGradient; } + rightWall { type zeroGradient; } + lowerWall { type zeroGradient; } + atmosphere { type zeroGradient; } + defaultFaces { type empty; diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties index c96db87002..d285821e5b 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/motionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object motionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties index e83df52445..0895b17162 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict index 7676445dfa..867860524d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict index 5383dee8cb..6fa70e6c90 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes index 78366ca0bb..0d2d8b5c88 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index f6e17f25b9..97dccb5b57 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -93,4 +92,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict index 00cbd8a401..00f29c93e6 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh index 34245108ab..95248d7537 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties index c96db87002..d285821e5b 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/motionProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object motionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties index e83df52445..0895b17162 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict index 0aedb5728a..a12022706d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/blockMeshDict @@ -105,4 +105,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict index 2ca6305599..992da60408 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes index 78366ca0bb..0d2d8b5c88 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 7a2d730e44..de10ce8584 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -87,4 +86,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict index 00cbd8a401..00f29c93e6 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T index 1b70d8e5c4..6ce1e1cef3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/T @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air index 01ca60ab16..54a73323f2 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury index f729e408b9..6524f2989d 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil index 4a8628b922..bf15f93323 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water index be2c17e6a8..823204793b 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh index 9b420c815b..67bd9687ef 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre index 9d3d4a8a37..3dd269fcca 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties index 8465846cd6..135c41a134 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 2.2831853; } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g index aa97844247..5934e5cfd7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 0 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties index e83df52445..635326981f 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/transportProperties @@ -10,40 +10,39 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // phases ( - water - { - transportModel Newtonian; - nu 1e-06; - rho 1000; - } + water + { + transportModel Newtonian; + nu 1e-06; + rho 1000; + } - oil - { - transportModel Newtonian; - nu 1e-06; - rho 500; - } + oil + { + transportModel Newtonian; + nu 1e-06; + rho 500; + } - mercury - { - transportModel Newtonian; - nu 1.125e-07; - rho 13529; - } + mercury + { + transportModel Newtonian; + nu 1.125e-07; + rho 13529; + } - air - { - transportModel Newtonian; - nu 1.48e-05; - rho 1; - } + air + { + transportModel Newtonian; + nu 1.48e-05; + rho 1; + } ); sigmas diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict index a0f14fbfc0..6e768718bc 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxAlphaCo 0.5; maxDeltaT 1; - functions { sTransport @@ -109,4 +107,6 @@ functions } } } + + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes index 5b8d9a3157..6477ea937a 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution index cd0bacefd0..542801e506 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -75,4 +74,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict index 5b2928b5b5..c9695ff36a 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun index 85ec45dcbb..f779483d1e 100755 --- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun +++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/Allrun @@ -12,6 +12,7 @@ canCompile || exit 0 # Dynamic code # Parallel runApplication decomposePar -cellDist + runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties index 1d1a274e4e..4f12bd376a 100644 --- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties +++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/thermophysicalProperties @@ -14,14 +14,14 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); -pMin 10000; +pMin 10000; sigma { - type constant; - sigma 0.07; + type constant; + sigma 0.07; } diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties index d8137df73f..b9b70921b6 100644 --- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties +++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/constant/turbulenceProperties @@ -14,11 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; diff --git a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution index 11eefb7828..3c4c1b4ac9 100644 --- a/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution +++ b/tutorials/multiphase/overCompressibleInterDyMFoam/compressibleTwoSimpleRotors/system/fvSolution @@ -96,7 +96,6 @@ PIMPLE nOuterCorrectors 2; nCorrectors 3; nNonOrthogonalCorrectors 0; - ddtCorr false; } diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U index 7b65d338f5..f3e40d809d 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/U @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k index b462e88792..7f41f0c079 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/k @@ -18,7 +18,6 @@ dimensions [0 2 -2 0 0 0 0]; internalField uniform 0.01; - boundaryField { #includeEtc "caseDicts/setConstraintTypes" diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale index 4caf6099b8..65fbc07082 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/motionScale @@ -16,7 +16,6 @@ FoamFile dimensions [0 0 0 0 0 0 0]; - internalField uniform 0; boundaryField diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh index 8a1fd60080..eea2365d83 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/p_rgh @@ -51,4 +51,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement index 69d67e8896..99b6b894a1 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/0.orig/pointDisplacement @@ -57,4 +57,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict index 03503032ca..3defe7b552 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/dynamicMeshDict @@ -20,7 +20,7 @@ dynamicFvMesh dynamicOversetFvMesh; motionSolver rigidBodyMotion; -report on; +report on; solver { @@ -126,6 +126,10 @@ restraints body rudder; referenceOrientation (1 0 0 0 1 0 0 0 1); axis (0 1 0); // Axis of rotation + relax 0.5; + p 0.5; + i 0.5; + d 0.5; omega sine; // Function1 entry omegaCoeffs { @@ -141,6 +145,10 @@ restraints body propeller; referenceOrientation (1 0 0 0 1 0 0 0 1); axis (1 0 0); + relax 0.5; + p 0.5; + i 0.5; + d 0.5; omega table ( (0 (0 0 0)) diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g index 22b147334b..28b07d0b87 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/g @@ -15,6 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 1 -2 0 0 0 0]; -value (0 -9.81 0);//( 0 -9.81 0 ); +value (0 -9.81 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties index 69ab717551..0a3210ea65 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -32,4 +32,5 @@ air sigma 0; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties index 7fda7da62a..b9b70921b6 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/constant/turbulenceProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { @@ -25,4 +25,5 @@ RAS printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict index 0053b91826..3d932902b6 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/blockMeshDict @@ -148,4 +148,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict index 8d7907a04e..a8d4f21bc3 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/controlDict @@ -59,7 +59,6 @@ maxAlphaCo 5.0; maxDeltaT 1; - functions { minMax diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict index 5818eabe6c..eded3e94ab 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes index 94cc4ebb2c..715ad329d9 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSchemes @@ -67,4 +67,5 @@ fluxRequired { } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution index 5289bd0919..16dd7092d9 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/fvSolution @@ -69,7 +69,6 @@ solvers relTol 0; } - "(U|k|omega|epsilon).*" { solver smoothSolver; @@ -94,8 +93,8 @@ PIMPLE turbOnFinalIterOnly yes; oversetAdjustPhi no; - } + potentialFlow { nNonOrthogonalCorrectors 2; @@ -119,4 +118,5 @@ cache grad(U); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict index fd73989ac9..93da9c9304 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 index 6d246f652d..11183495cb 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/refineMeshDict.2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict index 829c560961..1abe18b27e 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDict @@ -64,4 +64,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel index edeebdfb63..b2295ce6bc 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/setFieldsDictWaterLevel @@ -38,7 +38,7 @@ regions volScalarFieldValue alpha.water 1 ); } - ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull index 3dd4cec98c..dd6106d7ce 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictHull @@ -99,4 +99,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller index a552b75d10..798774e223 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictPropeller @@ -53,7 +53,6 @@ actions set propeller0; } - { name box; // hole in mesh type cellSet; @@ -100,4 +99,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine index e847774fd9..a54958e693 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine @@ -35,4 +35,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 index 1bffebbbed..fbb91c0bac 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.2 @@ -35,4 +35,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 index 1aa08c74b9..2cd7df3d9f 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.3 @@ -35,4 +35,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 index efc28f2e5f..462dd6d94f 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRefine.4 @@ -35,4 +35,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder index c8b7c92cfd..dfe58ab514 100644 --- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder +++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/system/topoSetDictRudder @@ -53,7 +53,6 @@ actions set rudder0; } - { name box; // hole in mesh type cellSet; @@ -100,4 +99,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean index b59c2c7a00..f04b9ede6f 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allclean @@ -3,6 +3,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ (cd background && ./Allclean) + (cd floatingBody && ./Allclean) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun index 0d76f4c072..d11b4e5ea8 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/Allrun @@ -4,6 +4,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ ./Allrun.pre + (cd background && runApplication $(getApplication)) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U index aa5f231db4..4c3fd517f8 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/U @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water index 5936f81765..15c1132bcb 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/alpha.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon index ccc2c4cc44..cd14a83edb 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/epsilon @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k index 77815cb6a8..57590b0f81 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/k @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut index 09ab216173..41faa1bc24 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/nut @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh index a7fd7bccc3..8b4c9c1e8a 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/p_rgh @@ -54,4 +54,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement index 39f7cf0014..3792b79da2 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/pointDisplacement @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID index b135df6949..a70d165e5d 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/0.orig/zoneID @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun index 588af966ba..e3119c1414 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/Allrun @@ -6,6 +6,7 @@ cd "${0%/*}" || exit # Run from this directory canCompile || exit 0 # Dynamic code runApplication blockMesh + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict index 4f7d398c02..0f856c3472 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/dynamicMeshDict @@ -96,4 +96,5 @@ sixDoFRigidBodyMotionCoeffs } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g index e79bb636ea..8ef179a199 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/g @@ -17,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties index 530a4acd18..0e40dfaf8c 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -32,4 +32,5 @@ air sigma 0.007; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties index 7fda7da62a..b9b70921b6 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/constant/turbulenceProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { @@ -25,4 +25,5 @@ RAS printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict index 9ebecb8467..1d058b5e4b 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/blockMeshDict @@ -71,4 +71,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict index 29741d5120..3583dd8591 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/controlDict @@ -54,7 +54,6 @@ maxAlphaCo 2.0; maxDeltaT 1; - functions { probes @@ -101,4 +100,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict index 6be38431e5..1100e69a73 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes index af340f0ada..ee0bb9d4c7 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSchemes @@ -71,4 +71,5 @@ fluxRequired alpha.water; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution index 41df39d2df..faf4b8df7a 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/fvSolution @@ -16,12 +16,10 @@ FoamFile solvers { - "cellDisplacement.*" { solver PCG; preconditioner DIC; - tolerance 1e-06; relTol 0; maxIter 100; @@ -102,7 +100,5 @@ relaxationFactors } } -cache -{} // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict index 2732fcac96..e10d88be1c 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/setFieldsDict @@ -58,7 +58,7 @@ regions volScalarFieldValue zoneID 1 ); } - ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict index 4593f4414b..52380c0896 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/background/system/topoSetDict @@ -39,4 +39,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict index 6ba5cb561f..720ac12719 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/blockMeshDict @@ -59,4 +59,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict index b049e114ff..93360c0534 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/controlDict @@ -52,4 +52,5 @@ maxAlphaCo 1; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes index 122423d8e9..460209e87d 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSchemes @@ -57,4 +57,5 @@ fluxRequired alpha.water; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution index 702e672d09..4f78eded0b 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/fvSolution @@ -49,7 +49,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -134,4 +133,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict index 3c43ba1750..abd007ffc7 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBody/floatingBody/system/topoSetDict @@ -31,4 +31,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean index 982b1116ba..668e230e58 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allclean @@ -3,6 +3,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ (cd background && ./Allclean) + (cd floatingBody && ./Allclean) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun index 0d76f4c072..d11b4e5ea8 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/Allrun @@ -4,6 +4,7 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ ./Allrun.pre + (cd background && runApplication $(getApplication)) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U index a0cff12a25..a8d8eb0b0f 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/U @@ -58,4 +58,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water index 36a83d232e..e14b1253cb 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/alpha.water @@ -65,4 +65,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon index f580003f67..9efffdc966 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/epsilon @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k index cd33231b59..e687a4b608 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/k @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut index 2842ba320a..558b693686 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/nut @@ -52,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh index 8586d0ca3f..f4c95b9c7d 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/p_rgh @@ -54,4 +54,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement index 974853e81d..ebb7a84685 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/pointDisplacement @@ -53,4 +53,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID index 34770225e9..a101cb3963 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/0.orig/zoneID @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict index c3cbcfb6a6..24b8767fc8 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/dynamicMeshDict @@ -109,4 +109,5 @@ solvers } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g index e79bb636ea..8ef179a199 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/g @@ -17,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 0 -9.81 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties index 530a4acd18..0e40dfaf8c 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -32,4 +32,5 @@ air sigma 0.007; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties index 7fda7da62a..b9b70921b6 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/constant/turbulenceProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { @@ -25,4 +25,5 @@ RAS printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict index ebb8d5a571..9a125116ed 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/blockMeshDict @@ -78,4 +78,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict index 4b3c3a0d98..4e51415f29 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes index fe32afa7f8..18539c4844 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSchemes @@ -71,4 +71,5 @@ fluxRequired alpha.water; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution index 333a7609ae..a0c30a5b15 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/fvSolution @@ -20,7 +20,6 @@ solvers { solver PCG; preconditioner DIC; - tolerance 1e-06; relTol 0; maxIter 100; @@ -101,7 +100,5 @@ relaxationFactors } } -cache -{} // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict index 96c7a70b5b..e63059a245 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/setFieldsDict @@ -40,14 +40,6 @@ regions ); } - /* - boxToCell - { - box ( 0.9 0.9 -100 ) ( 100 100 0.75 ); - fieldValues ( volScalarFieldValue alpha.water 1 ); - } - */ - cellToCell { set c0; @@ -69,4 +61,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict index 4593f4414b..52380c0896 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/background/system/topoSetDict @@ -39,4 +39,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre index 1f396f9a69..80b922bf2f 100755 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/Allrun.pre @@ -4,7 +4,9 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ runApplication blockMesh + runApplication topoSet + runApplication subsetMesh -overwrite c0 -patch floatingObject #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict index 6ba5cb561f..720ac12719 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/blockMeshDict @@ -59,4 +59,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict index b049e114ff..93360c0534 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/controlDict @@ -52,4 +52,5 @@ maxAlphaCo 1; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes index 122423d8e9..460209e87d 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSchemes @@ -57,4 +57,5 @@ fluxRequired alpha.water; } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution index 702e672d09..93eb9bfbd8 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/fvSolution @@ -49,7 +49,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-05; relTol 0; maxIter 100; @@ -88,7 +87,6 @@ solvers agglomerator faceAreaPair; mergeLevels 1; } - tolerance 1e-8; relTol 0; maxIter 20; @@ -134,4 +132,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict index 3c43ba1750..abd007ffc7 100644 --- a/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/floatingBodyWithSpring/floatingBody/system/topoSetDict @@ -31,4 +31,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U index e63b03c08f..ff7faf0efe 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/U @@ -52,4 +52,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water index e3d444f61e..fd81533db9 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/alpha.water @@ -27,10 +27,11 @@ boundaryField type zeroGradient; } - overset + overset { type overset; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon index 6986ac976c..ee34e560cc 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/epsilon @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k index fbcbb648a0..bcb8cfdf79 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/k @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut index dcd3a6fd79..3c53092bde 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/nut @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p index 65181dea32..8366446487 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh index 4350b4fc0e..2bd49cab09 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/p_rgh @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement index 7afb2fbb5b..198c73f06e 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/pointDisplacement @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID index db2217a7d8..426893f102 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/0.orig/zoneID @@ -33,4 +33,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun index 85ec45dcbb..f779483d1e 100755 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/Allrun @@ -12,6 +12,7 @@ canCompile || exit 0 # Dynamic code # Parallel runApplication decomposePar -cellDist + runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict index c1280b553e..09de2385ce 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/dynamicMeshDict @@ -48,4 +48,5 @@ multiSolidBodyMotionSolverCoeffs } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g index a1465941a8..0a45494f3f 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/g @@ -17,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 -9.81 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties index 7178bc2c93..15bbbed904 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water air); +phases (water air); water { @@ -32,4 +32,5 @@ air sigma 0.0; + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties index d8137df73f..b9b70921b6 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/constant/turbulenceProperties @@ -14,11 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict index 6384752412..6d02d13bd0 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/blockMeshDict @@ -145,4 +145,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict index 26e6d49691..231d96a970 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/controlDict @@ -61,7 +61,6 @@ maxAlphaCo 2.0; maxDeltaT 1; - functions { probes @@ -109,4 +108,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict index 05a9daf95f..d3db36e01a 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (3 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes index 2b5b20ee9a..fd5e345018 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSchemes @@ -77,4 +77,5 @@ oversetInterpolationSuppressed surfaceIntegrate(phiHbyA); } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution index bc9638c278..bbaf70e013 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/fvSolution @@ -20,7 +20,6 @@ solvers { solver PCG; preconditioner DIC; - tolerance 1e-06; relTol 0; maxIter 100; @@ -114,4 +113,5 @@ relaxationFactors } } + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict index 5d00ff1f5c..42f0865f67 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/setFieldsDict @@ -64,4 +64,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict index 3930dde0a9..dcc91bceb6 100644 --- a/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict +++ b/tutorials/multiphase/overInterDyMFoam/twoSimpleRotors/system/topoSetDict @@ -91,4 +91,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun index 27fce6927b..c6652f8e64 100755 --- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun +++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/Allrun @@ -12,6 +12,7 @@ canCompile || exit 0 # Dynamic code # Parallel runApplication decomposePar -cellDist + runParallel $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties index af7b43712b..de342a2d29 100644 --- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties +++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/transportProperties @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (water vapour); +phases (water vapour); phaseChangeTwoPhaseMixture SchnerrSauer; diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties index d8137df73f..b9b70921b6 100644 --- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties +++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/constant/turbulenceProperties @@ -14,11 +14,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; diff --git a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict index 6d02d13bd0..47879994bf 100644 --- a/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict +++ b/tutorials/multiphase/overInterPhaseChangeDyMFoam/twoSimpleRotors/system/blockMeshDict @@ -51,9 +51,7 @@ vertices blocks ( hex (0 1 2 3 4 5 6 7) (140 70 1) simpleGrading (1 1 1) - hex (8 9 10 11 12 13 14 15) movingZone1 (60 24 1) simpleGrading (1 1 1) - hex (16 17 18 19 20 21 22 23) movingZone2 (24 60 1) simpleGrading (1 1 1) ); diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict index b2fa9eef55..57d7d195de 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict index 699ff952d4..7975c9a3c0 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict @@ -93,4 +93,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict index e8222e85b5..e7276cf213 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,7 +52,6 @@ maxCo 0.4; maxDeltaT 1; - functions { forces @@ -87,4 +85,5 @@ functions } }; + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict index e46459e74f..ae24f1b31f 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict @@ -40,4 +40,5 @@ patches } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes index 3ecdb95436..2cae3d7a35 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,4 +46,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution index 37868bd1f7..23b030fda7 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom index 87c62a4b4e..d8424cb3f6 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom @@ -34,4 +34,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict index 16ed50ec2e..85a3a80ca3 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/blockMeshDict @@ -79,4 +79,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict index 72ae8ea952..a8a3042783 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.4; maxDeltaT 1; - functions { forces @@ -85,4 +83,5 @@ functions } }; + // ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes index 351eaa2642..638ce7559c 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution index 59e1164066..4ff35995f1 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun index 07a7802ec2..5628375500 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/Allrun @@ -5,11 +5,9 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir -application=$(getApplication) - runApplication blockMesh -runApplication $application +runApplication $(getApplication) if notTest "$@" then @@ -19,7 +17,7 @@ then foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' - runApplication -a $application + runApplication -a $(getApplication) fi #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g index 722ae9f25b..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties index 6862b1dcad..cc9f3266ef 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeMultiphaseSystem; +type thermalPhaseChangeMultiphaseSystem; -phases (gas liquid); +phases (gas liquid); phaseChange on; diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas index 0ff2a3a943..20d71d1779 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid index 15f549059b..f23806f61b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas index b46742f8d5..310273ba2e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.gas @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar;//RAS; +simulationType laminar; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid index fe2526b31f..2485a89104 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/turbulenceProperties.liquid @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict index 103be411db..1817e5b2f7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/blockMeshDict @@ -74,4 +74,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict index c5743bf504..a9d33267d0 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 0.05; maxDeltaT 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes index fd5b1fc435..0d4cae164b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution index 42b711b9d5..0aa45f71d7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 index ca9f0847a2..e7334f898a 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/0.orig/alphat.gas2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object alphat.gas2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun index 07a7802ec2..5628375500 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/Allrun @@ -5,11 +5,9 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir -application=$(getApplication) - runApplication blockMesh -runApplication $application +runApplication $(getApplication) if notTest "$@" then @@ -19,7 +17,7 @@ then foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' - runApplication -a $application + runApplication -a $(getApplication) fi #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g index 4a405bec52..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties index 7e14cce0b6..d2e92ec18b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeMultiphaseSystem; +type thermalPhaseChangeMultiphaseSystem; -phases (gas gas2 liquid); +phases (gas gas2 liquid); phaseChange on; diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas index 0ff2a3a943..20d71d1779 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 index 0ff2a3a943..20d71d1779 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid index 15f549059b..f23806f61b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas index b46742f8d5..310273ba2e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar;//RAS; +simulationType laminar; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 index b46742f8d5..310273ba2e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.gas2 @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar;//RAS; +simulationType laminar; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid index fe2526b31f..2485a89104 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/turbulenceProperties.liquid @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict index 103be411db..1817e5b2f7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/blockMeshDict @@ -74,4 +74,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict index c5743bf504..a9d33267d0 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 0.05; maxDeltaT 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes index fd5b1fc435..0d4cae164b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution index 42b711b9d5..0aa45f71d7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air index c6978c03c6..c080ee403c 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water index e80e066a64..37ea845c86 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water index 7eae197b6c..9da0789be8 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh index 5ee2ebbf6e..3d8406eb82 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh @@ -43,4 +43,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index 9872685e2f..b6be214cbe 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicMultiphaseSystem; +type basicMultiphaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict index d3e8fba1eb..3793f318f1 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index d36924d3ee..9dedb368f0 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution index c599ab3c29..83f4412386 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict index 20048d87d0..119282004c 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air index 3f4adea37d..c88a66db45 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury index 0a9b3d0622..44260b132e 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/T.mercury @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class volScalarField; - location "0"; object T.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta index 40b638f90e..595db950a4 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air index ba293edd3d..2494e439c3 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury index 48629a1635..48f22f53ab 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.mercury @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil index 06facc0cef..0ffc609d16 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.oil @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water index eebc0e51a4..9887ac49d7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air index ebe0e2a192..b73a7974ba 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury index 427b27ce9f..565851acc6 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.mercury @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil index 5890915cdc..a097b6b081 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.oil @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water index 905005560b..b9e1761d69 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p index f6ddd7fbd5..7d911a5d84 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh index d2b21c250e..30296f00f8 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre index 9d3d4a8a37..3dd269fcca 100755 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties index d16670a97a..bdb9fdd668 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 10.472; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 42c6f14876..6a9e7c7c6b 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicMultiphaseSystem; +type basicMultiphaseSystem; -phases (water oil mercury air); +phases (water oil mercury air); water { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air index ba7d497228..c1f588161c 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury index e4dd2e38a3..772d077165 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.mercury @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil index 1908a881eb..dc3dbef6f9 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.oil @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury index fcb0adf64c..5dc244f97d 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.mercury; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil index cff9016a0a..dfd37e62b3 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.oil; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict index c174b9eab3..3ae2cbf82f 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index b98141dc68..0982fdd694 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,4 +54,5 @@ snGradSchemes default uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index 611cc2ea20..13900d2768 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air index a615fd2389..53136e4bf6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water index 530900776d..d2b959be9c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta index 6685218655..3b3372ae19 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air index 40673aace0..deacc8487a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water index 66a25708a4..d19fdd9d9a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air index 86f4c4086c..e81d6d3d73 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water index fb2aa3eb0b..bf9801d972 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air index a9b69d4ab1..8fe2ff4d11 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water index 044d0c5c40..b5bacc3dd3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air index 5cc98089b3..580c110f06 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water index f6faddc147..b95ac005cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index 13a6a876f5..7f2bc21d97 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air index 301bdcb24f..8d0cda0bfc 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { - LESModel continuousGasKEqn; //Smagorinsky; + LESModel continuousGasKEqn; //Smagorinsky; turbulence on; + printCoeffs on; delta cubeRootVol; @@ -31,4 +31,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water index 4e6cf043f1..4c8e2d4471 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { - LESModel NicenoKEqn; //SmagorinskyZhang; + LESModel NicenoKEqn; //SmagorinskyZhang; turbulence on; + printCoeffs on; delta cubeRootVol; @@ -31,4 +31,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 53ac1bb584..de63d8da24 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes index b033569ba0..be017664b1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution index 5c50887cb1..77970ea35f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas index 0b0cb9c186..fe851e9b41 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.gas @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids index e8d718ef32..0784cf37cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/T.solids @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids index 4049ce473d..0455a7b399 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/Theta.solids @@ -12,7 +12,7 @@ FoamFile class volScalarField; object Theta.solids; } -// ************************************************************************* // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 2 -2 0 0 0 0]; @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas index c50c75a88f..579c6593b4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.gas @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids index 908e88ef90..488948f0bf 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/U.solids @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids index a87f5b5925..6f825a4892 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alpha.solids @@ -42,4 +42,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas index 0ea532c91b..20335236d7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.gas @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids index 8c9b48a605..937e3624b1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/alphat.solids @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas index c1937b981b..35f92fa4f2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/epsilon.gas @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas index d49606cfa8..e76a0c3195 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/k.gas @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas index 0772b2f85f..5a4a16c8b5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.gas @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids index ba7300a217..af726a1494 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/nut.solids @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p index d007d7875b..7bb846eb87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh index e1f33584a9..1c3264a884 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/0/p_rgh @@ -48,4 +48,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g index 4a405bec52..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties index 00f48b1706..70a0f79aaa 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (solids gas); +phases (solids gas); solids { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas index 1ac9a8e071..2cc10cca99 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids index f9f61327ab..30931a03d7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/thermophysicalProperties.solids @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.solids; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas index 86d2ec2d62..baf66ef595 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas @@ -10,35 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } -LES -{ - LESModel Smagorinsky; - - turbulence on; - printCoeffs on; - - delta cubeRootVol; - - cubeRootVolCoeffs - { - deltaCoeff 1; - } -} - // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids index ad7d6f3cb0..28032677c2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.solids; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kineticTheory; + RASModel kineticTheory; turbulence on; + printCoeffs on; kineticTheoryCoeffs diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict index a1d70c8f81..6832655825 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/blockMeshDict @@ -125,4 +125,5 @@ mergePatchPairs (wall_merge wall_merge2) ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict index f315e4e2eb..00ff61c65f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes index cfc4e15196..4da7dbc7da 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution index 5676024b70..0e3a4f3d1c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air index a615fd2389..53136e4bf6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water index 530900776d..d2b959be9c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta index 6685218655..3b3372ae19 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air index 1ef9eeeacd..710b3220cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air index 70031191b3..e3b87366a8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water index e1cf84aca9..c13cbeb320 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air index bb851eb16e..80257a0931 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water index f30788e0e6..91facc65dd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm index a997be6dc0..2f6781cb92 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air index ea7c9339b5..9a1143d17e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water index e9d9db34ea..cc80dd9e04 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km index cd43ee91b1..720312a826 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air index 45b2fc9855..e6dd5f6508 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water index e1d74901ae..d4c2051fff 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh index 06c760c1d9..20f6662cd4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh @@ -38,4 +38,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index 13a6a876f5..7f2bc21d97 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water index 4727cf5d7e..2e6ea5c747 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air index df20e46d48..f578ff10b3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; //continuousGasKEpsilon; + RASModel mixtureKEpsilon; //continuousGasKEpsilon; turbulence on; + printCoeffs on; // mixtureKEpsilonCoeffs @@ -31,4 +31,5 @@ RAS // } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water index f283e236b0..9737bd8cff 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; //LaheyKEpsilon; + RASModel mixtureKEpsilon; //LaheyKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 53ac1bb584..de63d8da24 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes index 4e1b0f9280..895a4a2979 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution index 16517019de..35cbb39b0a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas index d5e835ea8b..754f0f3fa7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid index dca0e32302..f3486a6203 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/AIR.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas index 0a8ab30aa7..48f5010bcd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/CO.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas index 6760af998d..2b03b5646f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid index 4248a7177a..f6e95dc81a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/H2O.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas index d1887a30ba..903e6f581c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.gas @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid index 54270e5b06..02e2329d9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/T.liquid @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas index 3b967ee69f..f262a310be 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.gas @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.gas; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid index 7e55204663..e0d43d0689 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/U.liquid @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.liquid; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas index cca6ccf73b..425011249b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/Ydefault.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas index 248c8f354f..fa61e02700 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid index 350319fc15..0e78f27f7b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alpha.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas index 1c0f5402e9..8fd997147d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/alphat.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas index 053dc487a6..c563cf8079 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/epsilon.gas @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas index cc8ab2c2f6..3dac754e1a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/k.gas @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas index c3a4b0c741..67218d7126 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/nut.gas @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p index e8d9da3792..40653c60d3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh index a9637739c3..14fd81c63a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas index ae188df8be..cae5b8cd9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/chemistryProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object chemistryProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -37,4 +36,5 @@ odeCoeffs relTol 0.01; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas index c1bf6866fc..94acaef3b1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/combustionProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object combustionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,4 +21,5 @@ PaSRCoeffs Cmix 1.0; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties index e5faa5b6c8..87f853d3e8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type interfaceCompositionPhaseChangeTwoPhaseSystem; +type interfaceCompositionPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); gas { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas index 004b6bae2d..ef6abea637 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid index 1cd1b979d1..fe7abec8a3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas index 4e8a04f54b..16da8d00e7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas @@ -10,18 +10,17 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; - turbulence on; + turbulence on; } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid index 1ebede1a7d..c21588291f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict index e60eee3466..cf9e3843a0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict index feb6127cd1..f65004969b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 6 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes index 54b2c746d4..43d62438ea 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution index 2e7cc5f9d5..b8b5bb94cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict index 7e64c3bf2f..0f1a198a18 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air index a615fd2389..53136e4bf6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water index 530900776d..d2b959be9c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta index 6685218655..3b3372ae19 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/Theta @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air index 70031191b3..e3b87366a8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water index e1cf84aca9..c13cbeb320 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/alphat.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air index bb851eb16e..80257a0931 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water index f30788e0e6..91facc65dd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilon.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm index a997be6dc0..2f6781cb92 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/epsilonm @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles index 870949127d..e43a5d4193 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/f.air.bubbles @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air index ea7c9339b5..9a1143d17e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water index e9d9db34ea..cc80dd9e04 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/k.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km index cd43ee91b1..720312a826 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/km @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air index 5cc98089b3..580c110f06 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.air @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water index f6faddc147..b95ac005cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/nut.water @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties index cba7417524..8b85342cd5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type populationBalanceTwoPhaseSystem; +type populationBalanceTwoPhaseSystem; -phases (air water); +phases (air water); populationBalances (bubbles); diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air index bae0e65957..93bcec623e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; // continuousGasKEpsilon; + RASModel mixtureKEpsilon; // continuousGasKEpsilon; turbulence on; + printCoeffs on; // mixtureKEpsilonCoeffs @@ -31,4 +31,5 @@ RAS // } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water index c302655a35..9e962d1917 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; // LaheyKEpsilon; + RASModel mixtureKEpsilon; // LaheyKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict index 4457cdce5b..261dd08ce2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes index d28ec6a631..57a78fdfda 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution index 95fe84d686..f596a2308d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict index 5b56ee3a21..f4fc7541cd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/system/topoSetDict @@ -38,4 +38,5 @@ actions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air index 1bf14ee7d5..fcfe1978de 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles index f72fa7714b..2c97b75af6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles index 180fa8b932..43bbfdedd8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air index 7256909c00..096fda3316 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles index 95768a2ad9..d0a28a0e08 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air index 2d2a97f803..df8ef22135 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles index 5e112f5504..f4735f18be 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air index 40673aace0..deacc8487a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles index e577438533..7517e447eb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air index 30a47b4ca2..d961694df6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air index c0c5739f09..604342dd69 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // \ No newline at end of file diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles index 30dda23059..cfecbc4e15 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p index 26f16a7a06..6e4e249ddb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh index 53585d65e3..e738541e58 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index 7d3408d8f2..b950b749c2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (particles air); +phases (particles air); particles { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles index 008c2cdb27..4d509cfaa6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air index 35f95b28d3..66dfd3a543 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air @@ -10,35 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } -LES -{ - LESModel Smagorinsky; - - turbulence on; - printCoeffs on; - - delta cubeRootVol; - - cubeRootVolCoeffs - { - deltaCoeff 1; - } -} - // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles index 21d51a46a6..86245e5a59 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kineticTheory; + RASModel kineticTheory; turbulence on; + printCoeffs on; kineticTheoryCoeffs diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict index 3f4b950a99..fe125cf9f2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict @@ -63,4 +63,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index 04e6f71dc1..d09782a63c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.9; maxDeltaT 1e-05; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes index 938ff82dfc..e84299974f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution index e9cd8a4f51..f7ab047d5b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict index f966cac17a..a1702dc324 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g index 722ae9f25b..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties index 6ae275b9c6..b24d9319ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeTwoPhaseSystem; +type thermalPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); phaseChange on; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas index 3eef2cd173..3562b17e61 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,7 +25,6 @@ thermoType energy sensibleInternalEnergy; } - mixture { specie @@ -37,7 +35,6 @@ mixture { rho 1; } - thermodynamics { Hf 0; @@ -52,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid index d79dcd913f..5e208f3b81 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas index 96439d22c1..4b39baf3b2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel continuousGasKEpsilon; + RASModel continuousGasKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid index 1723136da1..6394672b0c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel LaheyKEpsilon; + RASModel LaheyKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict index 641cb72e8c..e18b985580 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/blockMeshDict @@ -74,4 +74,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict index 9074c16161..e5d1da0aee 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 0.05; maxDeltaT 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes index 0d04392f34..45792d5887 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution index e49bc468c8..8d57ef1028 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun index 12347ec8dd..5628375500 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/Allrun @@ -3,13 +3,11 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ -application=$(getApplication) - restore0Dir runApplication blockMesh -runApplication $application +runApplication $(getApplication) if notTest "$@" then @@ -19,7 +17,7 @@ then foamDictionary 0.5/T.liquid -entry boundaryField.wall2.q -set 'uniform 500000' foamDictionary 0.5/T.liquid -entry boundaryField.wall1.q -set 'uniform 500000' foamDictionary 0.5/U.liquid -entry boundaryField.inlet.type -set 'fixedValue' - runApplication -a $application + runApplication -a $(getApplication) fi #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g index 722ae9f25b..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties index 3d37e4c3aa..e5991d5711 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeTwoPhaseSystem; +type thermalPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); phaseChange on; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas index 0ff2a3a943..20d71d1779 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid index 15f549059b..f23806f61b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas index b46742f8d5..310273ba2e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.gas @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar;//RAS; +simulationType laminar; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid index fe2526b31f..2485a89104 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/turbulenceProperties.liquid @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict index 103be411db..1817e5b2f7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/blockMeshDict @@ -74,4 +74,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict index f51b2ca2fc..1610fe8a28 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 0.05; maxDeltaT 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes index fd5b1fc435..0d4cae164b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution index 42b711b9d5..0aa45f71d7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g index 722ae9f25b..e7fde4fc81 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value ( 0 -9.81 0 ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties index 4b21150355..9b291997af 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeTwoPhaseSystem; +type thermalPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); phaseChange on; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas index 3eef2cd173..3562b17e61 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,7 +25,6 @@ thermoType energy sensibleInternalEnergy; } - mixture { specie @@ -37,7 +35,6 @@ mixture { rho 1; } - thermodynamics { Hf 0; @@ -52,4 +49,5 @@ mixture } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid index cec4c5cb24..ae6d1cc95e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas index 96439d22c1..4b39baf3b2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel continuousGasKEpsilon; + RASModel continuousGasKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid index 1723136da1..6394672b0c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel LaheyKEpsilon; + RASModel LaheyKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict index 641cb72e8c..e18b985580 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/blockMeshDict @@ -74,4 +74,5 @@ boundary } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict index 9074c16161..e5d1da0aee 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,4 +50,5 @@ maxCo 0.05; maxDeltaT 0.001; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes index e442b5081c..a694bd386e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution index b7d30b839f..346d93a661 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air index a615fd2389..53136e4bf6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water index 530900776d..d2b959be9c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta index 6685218655..3b3372ae19 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index 9c5e94d305..8b7e8a690a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 53ac1bb584..de63d8da24 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index 18361e9eb8..2fd57ff240 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution index c599ab3c29..83f4412386 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas index 0a8ab30aa7..48f5010bcd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/CO.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas index 6760af998d..2b03b5646f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid index 4248a7177a..f6e95dc81a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/H2O.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas index 88693a1054..f423ab29a9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.gas @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid index 88b1a8a680..463aad80b8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/T.liquid @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas index 3b967ee69f..f262a310be 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.gas @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.gas; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid index 7e55204663..e0d43d0689 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/U.liquid @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.liquid; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault index f2020aab0f..2ea725e800 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/Ydefault @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas index f77d2a5ffb..7218c62b24 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid index a72dd48067..2911e0b85b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/air.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas index 248c8f354f..fa61e02700 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid index 350319fc15..0e78f27f7b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/alpha.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties index 671d1cd514..92a8ce697b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type interfaceCompositionPhaseChangeTwoPhaseSystem; +type interfaceCompositionPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); gas { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas index 9e7fbf633c..45534d4b74 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid index 03811b4311..05d791c8aa 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas index 6cfe8c8570..459e528623 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid index 1ebede1a7d..c21588291f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions index f6b622ae73..a29b21ef2a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions @@ -81,4 +81,5 @@ totalMass #}; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict index 2931fb8c28..69fc3f5ad5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict index feb6127cd1..f65004969b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 6 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes index 390862e3e5..ee012645c7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution index 506c004f11..36fdcf3a57 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict index 7e64c3bf2f..0f1a198a18 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas index bbdc013faa..10dd745ad8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.gas @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid index d7046512a4..0bcd9b0ac8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/T.liquid @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas index de73b97431..7f2aa3d45e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.gas @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.gas; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid index 0256a38094..65b0c16265 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/U.liquid @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.liquid; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas index ed580d914e..c33de2a5cf 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid index a72dd48067..2911e0b85b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/air.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas index 7df851ba5f..f71550abf9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.gas @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid index cfb853eefd..96c4a3909d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/0.orig/water.liquid @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties index 9ad007f3d9..f0b86557ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type interfaceCompositionPhaseChangeTwoPhaseSystem; +type interfaceCompositionPhaseChangeTwoPhaseSystem; -phases (gas liquid); +phases (gas liquid); gas { @@ -239,4 +238,5 @@ turbulentDispersion // Minimum allowable pressure pMin 10000; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas index 3cc5bdda07..ea0191e64a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.gas @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid index 589f934014..00c73cf9c2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas index 6cfe8c8570..459e528623 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid index 1ebede1a7d..c21588291f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict index 2931fb8c28..69fc3f5ad5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes index 390862e3e5..ee012645c7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution index a863e0d11e..f644d001c5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict index fac6fa54b6..a09f0be1f9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air index a615fd2389..53136e4bf6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water index 6bfdcc8562..310cceef69 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta index 6685218655..3b3372ae19 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air index fccdd791c2..ecaf091b68 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh index 7b4a40024c..bdf3f8ab05 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index f0ca95ec47..ebe94a492f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 8d50b63800..86b5b90e50 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes index 7f65754aaa..023a2231e9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution index d5e55c6b53..ccc28d4d20 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air index 1bf14ee7d5..fcfe1978de 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles index 8e0fc09a5c..86dbc850df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles index 180fa8b932..43bbfdedd8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air index 7256909c00..096fda3316 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles index 95768a2ad9..d0a28a0e08 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles index 5e112f5504..f4735f18be 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles index e577438533..7517e447eb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air index 558732e516..d961694df6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air index 68b4991c44..c2132b8a95 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air index 1b10a505f2..6ffe68b928 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles index 30dda23059..cfecbc4e15 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p index 26f16a7a06..6e4e249ddb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh index 53585d65e3..e738541e58 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index b3c0296118..c12331bf0c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (particles air); +phases (particles air); particles { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles index 008c2cdb27..4d509cfaa6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles index a375e1d261..c482e250f5 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel phasePressure; + RASModel phasePressure; turbulence on; + printCoeffs on; kineticTheoryCoeffs diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict index 3f4b950a99..fe125cf9f2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/blockMeshDict @@ -63,4 +63,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 24158570bb..6eebee01de 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.9; maxDeltaT 1e-05; - functions { fieldAverage1 diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes index db0d456678..e7d4b0b6d7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,4 +58,5 @@ snGradSchemes bounded uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution index b3f0284add..c54079a9a6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict index f966cac17a..a1702dc324 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air index b6d8f0682f..ab662c3552 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.air @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water index 0bdfea2764..ebc718b99a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/T.water @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air index ccb142caab..79397cbfb9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water index c79fe16249..f879a14996 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air index 6daa3acf18..8b8651d9d6 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/alpha.air @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p index d141024fc7..208351ec49 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p @@ -33,4 +33,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh index 669812196c..a193418e5b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/0.orig/p_rgh @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions index 2c152ab378..f535d94ef0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties index 12d532ff3a..0b763caecc 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict index f44b866e89..e5b9149678 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/blockMeshDict @@ -55,4 +55,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict index d2dc6b1e6a..020e5cb920 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes index c8d8292ecc..7e06ead07f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution index c599ab3c29..83f4412386 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air index 16cbf883dc..2eb10a18f0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water index d614baf4e7..0b68ffd259 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta index 40b638f90e..595db950a4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air index ba293edd3d..2494e439c3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water index eebc0e51a4..9887ac49d7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air index e8b8ecee4c..d8c634a70a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p index 13065b36c2..1b1b035a49 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh index 04c19179b0..6dae330d93 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre index 9d3d4a8a37..3dd269fcca 100755 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties index d16670a97a..bdb9fdd668 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 10.472; } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 7b8f76bee7..297a1adf24 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -10,14 +10,13 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type basicTwoPhaseSystem; +type basicTwoPhaseSystem; -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict index 2157f9b16b..bdf1935a36 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index e1939c5964..47f50d3cc8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index e104e67f5d..10cf9222a4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict index 403e370591..b7cf8da47c 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam index 216ed8bc7c..a49c30d964 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.steam @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water index 4e2cfb3acc..24e07257fe 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/T.water @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam index 76cb2cceaf..d98b91e7d2 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.steam @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.steam; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water index 2cda9a6a48..f2d6e078a9 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water index 05ea8d419d..802b3c786a 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/nut.water @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p index 3d75fefffd..c8e9a8c120 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh index af8a28b597..2c8bb5c419 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam index 2b0543c102..69a16efa1e 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.steam @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water index 17b7dcc56f..0c9d979846 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/0.orig/water.water @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions index f24eead15a..f14237acfe 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties index 8262110a34..4a3c040d4b 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/phaseProperties @@ -10,17 +10,15 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -type thermalPhaseChangeTwoPhaseSystem; +type thermalPhaseChangeTwoPhaseSystem; -phases (steam water); - -phaseChange on; +phases (steam water); +phaseChange on; steam { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam index fffee0d852..0f125539c4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.steam @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.steam; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water index aa51c3453b..8e2a63bbe3 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam index 7ef0c3156c..50f0a256d4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.steam; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water index 2a61f4e262..b35b311b2d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict index 9f5f0cbfc7..c86b0cbe18 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.1; maxDeltaT 1e-2; - functions { timeStepping diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes index 54b2c746d4..43d62438ea 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution index a966d6cc06..27772b7dd1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g index 72a61dd0aa..28b07d0b87 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,4 +17,5 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 -9.81 0); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties index 202c09c421..4753fe47e0 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/transportProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object transportProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,4 +33,5 @@ water rho 990; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict index c8a742266c..1250cdb661 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/blockMeshDict @@ -85,4 +85,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict index a1e7acf25c..0b6f8c2434 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,4 +52,5 @@ maxAlphaCo 0.5; maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes index 71387c56d5..38f09dcfa5 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,4 +49,5 @@ snGradSchemes default corrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution index 8b24d4d3a7..578ca0bc0a 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict index b1853057e4..c8460cf80f 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict @@ -33,4 +33,5 @@ regions } ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air index 6032ad1ac4..c080ee403c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water index cacd6a90e5..37ea845c86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air index 327fc03a82..2b7d0bd201 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -25,12 +25,14 @@ boundaryField type fixedValue; value $internalField; } + outlet { type pressureInletOutletVelocity; phi phi.air; value $internalField; } + walls { type fixedValue; @@ -38,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air index 40673aace0..deacc8487a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water index 66a25708a4..d19fdd9d9a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/alphat.water @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air index cb196f22d1..6e47993706 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water index 2eb1e2a0d4..377487dd86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/epsilon.water @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air index f509276173..908647e470 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water index afc6763cc7..c7661d353c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/k.water @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air index 45b2fc9855..e6dd5f6508 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water index e1d74901ae..d4c2051fff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/nut.water @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p index 243f8fe5ba..b88d0d3e9f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p @@ -25,11 +25,13 @@ boundaryField type calculated; value $internalField; } + outlet { type calculated; value $internalField; } + walls { type calculated; @@ -37,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh index 2318093c17..f974014f4b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/0.orig/p_rgh @@ -25,12 +25,14 @@ boundaryField type fixedFluxPressure; value $internalField; } + outlet { type prghPressure; p $internalField; value $internalField; } + walls { type fixedFluxPressure; @@ -38,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties index 40ee2ee74f..7c946289d8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air index 301bdcb24f..8d0cda0bfc 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { - LESModel continuousGasKEqn; //Smagorinsky; + LESModel continuousGasKEqn; //Smagorinsky; turbulence on; + printCoeffs on; delta cubeRootVol; @@ -31,4 +31,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water index 4e6cf043f1..4c8e2d4471 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType LES; +simulationType LES; LES { - LESModel NicenoKEqn; //SmagorinskyZhang; + LESModel NicenoKEqn; //SmagorinskyZhang; turbulence on; + printCoeffs on; delta cubeRootVol; @@ -31,4 +31,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 13ca5d4d33..d2b8014ffd 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes index b033569ba0..be017664b1 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution index abaf322d71..86da0e3d6f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air index c6978c03c6..c080ee403c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water index e80e066a64..37ea845c86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air index 40673aace0..deacc8487a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water index 66a25708a4..d19fdd9d9a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/alphat.water @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air index cb196f22d1..6e47993706 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water index 2eb1e2a0d4..377487dd86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilon.water @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm index ed997e66f2..ab54129f90 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/epsilonm @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air index f509276173..908647e470 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water index afc6763cc7..c7661d353c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/k.water @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km index 36ca416eb6..f9a90c083e 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/km @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air index 45b2fc9855..e6dd5f6508 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water index e1d74901ae..d4c2051fff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/nut.water @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh index 7353100e19..f974014f4b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties index 40ee2ee74f..7c946289d8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air index df20e46d48..f578ff10b3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; //continuousGasKEpsilon; + RASModel mixtureKEpsilon; //continuousGasKEpsilon; turbulence on; + printCoeffs on; // mixtureKEpsilonCoeffs @@ -31,4 +31,5 @@ RAS // } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water index f283e236b0..9737bd8cff 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water @@ -10,19 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel mixtureKEpsilon; //LaheyKEpsilon; + RASModel mixtureKEpsilon; //LaheyKEpsilon; turbulence on; + printCoeffs on; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index d45b5d7d17..2211518ee3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { fieldAverage1 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes index 4e1b0f9280..895a4a2979 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution index 97fb26c90f..bdbd5373c6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air index e47454421d..fcfe1978de 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles index bf79c58b22..86dbc850df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/T.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles index 180fa8b932..43bbfdedd8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/Theta.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air index 7256909c00..096fda3316 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles index 95768a2ad9..d0a28a0e08 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/U.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air index 2d2a97f803..df8ef22135 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles index 5e112f5504..f4735f18be 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alpha.particles @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air index 40673aace0..deacc8487a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.air @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles index e577438533..7517e447eb 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/alphat.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air index 558732e516..d961694df6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air index 68b4991c44..c2132b8a95 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air index b3f57d9ba2..6ffe68b928 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles index 3efa9ccb4a..cfecbc4e15 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/nut.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p index 3042c4dad7..6e4e249ddb 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh index 7e2df5ed7b..a8f9f43d2d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/0.orig/p_rgh @@ -45,4 +45,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties index 9b9d70a747..cbae9be888 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (particles air); +phases (particles air); particles { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles index 008c2cdb27..4d509cfaa6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/thermophysicalProperties.particles @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air index 35f95b28d3..66dfd3a543 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air @@ -10,35 +10,20 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kEpsilon; + RASModel kEpsilon; turbulence on; + printCoeffs on; } -LES -{ - LESModel Smagorinsky; - - turbulence on; - printCoeffs on; - - delta cubeRootVol; - - cubeRootVolCoeffs - { - deltaCoeff 1; - } -} - // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles index 21d51a46a6..86245e5a59 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel kineticTheory; + RASModel kineticTheory; turbulence on; + printCoeffs on; kineticTheoryCoeffs diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict index 3f4b950a99..fe125cf9f2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/blockMeshDict @@ -63,4 +63,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index f59db6da43..32b008d13f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.9; maxDeltaT 1e-05; - functions { fieldAverage1 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes index c9a4f98ffe..68c349e250 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,4 +64,5 @@ snGradSchemes bounded uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution index 6338c143e2..0e66125fd0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict index f966cac17a..a1702dc324 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air index c6978c03c6..c080ee403c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water index e80e066a64..37ea845c86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh index 7353100e19..f974014f4b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties index 4351fb4fa2..d1b36e3ec8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict index 494027bfaf..c634104b14 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict @@ -58,4 +58,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index c76666aa5d..cb86fa2148 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.5; maxDeltaT 1; - functions { add1 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes index 18361e9eb8..2fd57ff240 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution index a12918f027..de5c84d09d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air index c6978c03c6..c080ee403c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water index e80e066a64..37ea845c86 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta index e61ad817e2..929954cbe2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air index fc6afe0e3b..2b7d0bd201 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water index af7581240a..fe3f790990 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air index 7f8e2c067a..61b70148d0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air @@ -40,4 +40,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air index 315057f525..6896e39d3d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p index 1010a94b06..b88d0d3e9f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p @@ -39,4 +39,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh index 7353100e19..f974014f4b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh @@ -40,4 +40,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties index bbdb040900..5b35c1be5c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air index 505b4f5273..43664e1622 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar; +simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 13ca5d4d33..ab175ed789 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes index 7f65754aaa..023a2231e9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution index 52dc6f0c6a..21d2c1558a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air index 1bf14ee7d5..fcfe1978de 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles index 8e0fc09a5c..86dbc850df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles index 180fa8b932..43bbfdedd8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air index 7256909c00..096fda3316 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air @@ -46,4 +46,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles index 95768a2ad9..d0a28a0e08 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles index 5e112f5504..f4735f18be 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles index e577438533..7517e447eb 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles @@ -44,4 +44,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air index 558732e516..d961694df6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air index 68b4991c44..c2132b8a95 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air @@ -46,4 +46,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air index 1b10a505f2..6ffe68b928 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles index 30dda23059..cfecbc4e15 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p index 26f16a7a06..6e4e249ddb 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p @@ -44,4 +44,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh index 895f07bd6b..a8f9f43d2d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh @@ -45,4 +45,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties index e5564f85d3..4707fc5d17 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (particles air); +phases (particles air); particles { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles index 008c2cdb27..4d509cfaa6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles index a375e1d261..c482e250f5 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles @@ -10,18 +10,18 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.particles; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType RAS; +simulationType RAS; RAS { - RASModel phasePressure; + RASModel phasePressure; turbulence on; + printCoeffs on; kineticTheoryCoeffs diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 4239af11f7..9d32f16976 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +50,6 @@ maxCo 0.9; maxDeltaT 1e-05; - functions { fieldAverage1 diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes index db0d456678..e7d4b0b6d7 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,4 +58,5 @@ snGradSchemes bounded uncorrected; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution index b3f0284add..922ef68876 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,9 +20,7 @@ solvers { nAlphaCorr 1; nAlphaSubCycles 2; - smoothLimiter 0.1; - implicitPhasePressure yes; solver smoothSolver; smoother symGaussSeidel; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict index f966cac17a..a1702dc324 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air index b6d8f0682f..ab662c3552 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water index 0bdfea2764..ebc718b99a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air index ccb142caab..79397cbfb9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.air; } @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water index c79fe16249..f879a14996 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object U.water; } @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air index 6daa3acf18..8b8651d9d6 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air @@ -34,4 +34,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p index d141024fc7..208351ec49 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p @@ -33,4 +33,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh index 669812196c..a193418e5b 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh @@ -34,4 +34,5 @@ boundaryField } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions index 2c152ab378..f535d94ef0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object fvOptions; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g index f1bc407443..28b07d0b87 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties index 8eb8479a84..af27e88875 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict index f44b866e89..e5b9149678 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict @@ -55,4 +55,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict index b243e88386..219e5aad70 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes index c8d8292ecc..7e06ead07f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution index a12918f027..de5c84d09d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict index f3aba1fb4b..ace0fe69f4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air index 16cbf883dc..2eb10a18f0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water index d614baf4e7..0b68ffd259 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta index 40b638f90e..595db950a4 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air index ba293edd3d..2494e439c3 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water index eebc0e51a4..9887ac49d7 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air index e8b8ecee4c..d8c634a70a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air @@ -41,4 +41,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p index 13065b36c2..1b1b035a49 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh index 04c19179b0..6dae330d93 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh @@ -43,4 +43,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre index 47696a0072..3b515c8977 100755 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre @@ -4,7 +4,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ m4 system/blockMeshDict.m4 > system/blockMeshDict - runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties index d16670a97a..bdb9fdd668 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object MRFProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -28,4 +27,5 @@ MRF1 omega constant 10.472; } + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g index 4b5a9eea4c..5934e5cfd7 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties index 0804552921..39f00ee3df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties @@ -10,12 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object phaseProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -phases (air water); +phases (air water); air { diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air index e2562237dc..5db8359e5f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index c882329e2a..c7707da005 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object thermophysicalProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air index 505b4f5273..68b704d33f 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water index 77b41ae6d0..eec15770ca 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water @@ -10,11 +10,11 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // simulationType laminar; + // ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict index 1388e3a511..701e333141 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes index e1939c5964..47f50d3cc8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution index a2b7e84fdf..af5b30e925 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict index 403e370591..ef51cdb173 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object topoSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -26,4 +25,5 @@ actions } ); + // ************************************************************************* //