diff --git a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict index f2c9898422..ed502c40f6 100644 --- a/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict +++ b/tutorials/compressible/acousticFoam/obliqueAirJet/precursor/system/controlDict @@ -57,7 +57,7 @@ functions type surfaces; surfaceFormat boundaryData; writeControl timeStep; - writeInterval 10; + writeInterval 100; interpolationScheme cell; fields ( diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean new file mode 100755 index 0000000000..94f799b462 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allclean @@ -0,0 +1,9 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ + +(cd steadyState && ./Allclean) + +(cd transient && ./Allclean) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun index a33cc4cb38..5e577cba00 100755 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun @@ -1,6 +1,5 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ (cd steadyState && ./Allrun) diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean new file mode 100755 index 0000000000..fb1f384730 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions +#------------------------------------------------------------------------------ + +cleanCase0 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict index 7d5ae78368..7617e7e91d 100644 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict @@ -31,11 +31,10 @@ vertices blocks ( - hex (0 1 2 3 4 5 6 7) (200 160 80) simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1) + hex (0 1 2 3 4 5 6 7) (200 160 80) + simpleGrading (1 ((0.5 0.5 100)(0.5 0.5 0.01)) 1) ); - - edges #codeStream { codeInclude diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict index 8fc20ec2de..4b38d441a4 100644 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict @@ -105,12 +105,17 @@ functions { type sets; libs (sampling); - writeControl writeTime; - timeStart 1500.5; // approx 2x flow-throughs - interpolationScheme cellPoint; + setFormat raw; + executeControl onEnd; + writeControl onEnd; - setFormat raw; + fields + ( + U + columnAverage:columnAverage(UMean) + columnAverage:columnAverage(UPrime2Mean) + ); sets ( @@ -185,14 +190,6 @@ functions end (0.224 1 0.063); } ); - - - fields - ( - U - columnAverage:columnAverage(UMean) - columnAverage:columnAverage(UPrime2Mean) - ); } } diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict index 3ee1dd39d0..c0a54d302a 100644 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs (turbulenceModelSchemes); +libs (turbulenceModelSchemes); application pimpleFoam; @@ -54,6 +54,7 @@ functions libs (fieldFunctionObjects); fields (U p); } + DESField { // Mandatory entries diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample index b79002dc8e..119306db68 100644 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample @@ -16,7 +16,7 @@ FoamFile type sets; libs (sampling); -writeControl writeTime; +writeControl onEnd; interpolationScheme cellPoint; setFormat raw; diff --git a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict index 26381a9396..bd6fc7ab66 100644 --- a/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/vortexShed/system/controlDict @@ -80,8 +80,8 @@ functions log true; timeStart 100; timeEnd 1000; - executeControl timeStep; - executeInterval 1; + executeControl runTime; + executeInterval 10; } curlePoint @@ -108,8 +108,8 @@ functions log true; timeStart 100; timeEnd 1000; - executeControl timeStep; - executeInterval 1; + executeControl runTime; + executeInterval 10; } cuttingPlane diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite index bc4fce4674..14a680f0e7 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/system/ensightWrite @@ -18,7 +18,7 @@ ensightWrite overwrite true; - writeControl writeTime; + writeControl onEnd; consecutive false; } diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization index 56476c469d..94f3ddf562 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/visualization @@ -11,7 +11,7 @@ // Timing _visualization { - writeControl writeTime; + writeControl onEnd; // enabled true; diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict index fa2ae2cdd6..a3ed4352a4 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +68,6 @@ functions (0.1524 0.0253 0) (0.1778 0.0253 0) ); - } fieldAverage1 @@ -101,7 +99,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict index 06518a1ad5..e404a0fb5f 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/system/controlDict @@ -99,7 +99,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample index 485c990032..5b1a16fa66 100644 --- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample +++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample @@ -1,7 +1,7 @@ type sets; libs (sampling); -writeControl writeTime; +writeControl onEnd; interpolationScheme cellPoint; diff --git a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun index 7be851a4cf..4a8c98ea2f 100755 --- a/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun +++ b/tutorials/mesh/moveDynamicMesh/relativeMotion/Allrun @@ -11,7 +11,6 @@ cd "${0%/*}" || exit # Run from this directory runApplication snappyHexMesh -overwrite runApplication renumberMesh -overwrite runApplication createPatch -overwrite - ) # Make a 2D mesh by extruding a patch and solve to steady state. diff --git a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict index 8275725845..2f8c4acac3 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/laminar/sloshingTank2D/system/controlDict @@ -75,7 +75,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; surfaceFormat raw; fields ( diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict index 6a6c59d18d..f363f85909 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict @@ -75,7 +75,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; surfaceFormat raw; fields ( diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict index 6a6c59d18d..f363f85909 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict @@ -75,7 +75,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; surfaceFormat raw; fields ( diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict index 1da8e0814e..94d8d33b85 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict @@ -59,11 +59,17 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U + alpha.water + ); sets ( @@ -107,7 +113,6 @@ functions end ( 7.5 0.005 0.8 ); nPoints 1001; } - line6 { type uniform; @@ -133,12 +138,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict index a679cdd888..9e4fa497fc 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict @@ -59,11 +59,17 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U alpha.water + ); + sets ( line1 @@ -74,14 +80,6 @@ functions end ( 7.9253 19.8599 30.0 ); nPoints 1001; } - - ); - - fixedLocations false; - - fields - ( - U alpha.water ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict index 8e70940bf4..28f23bc0c8 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict @@ -60,10 +60,20 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + p + p_rgh + U + alpha.water + ); + sets ( s1 @@ -147,13 +157,6 @@ functions nPoints 101; } ); - - fixedLocations false; - - fields - ( - p p_rgh U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict index 62de4ebb1e..b49f2b2ec6 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,11 +59,17 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U alpha.water + ); + sets ( line1 @@ -107,7 +112,6 @@ functions end ( 7.5 0.01 1.5 ); nPoints 1001; } - line6 { type uniform; @@ -117,12 +121,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict index 9389a10a7b..6f60258c99 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict @@ -59,7 +59,7 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict index 52c0e356a0..6e3a0a44e7 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict @@ -59,7 +59,7 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict index ddb56a5171..4133bbef95 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,11 +59,18 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U + alpha.water + ); + sets ( line1 @@ -107,7 +113,6 @@ functions end ( 7.5 0.02 0.75 ); nPoints 1001; } - line6 { type uniform; @@ -133,12 +138,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict index f25a7a2507..59316cb5d6 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,11 +59,18 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U + alpha.water + ); + sets ( line1 @@ -107,7 +113,6 @@ functions end ( 7.5 0.02 0.55 ); nPoints 1001; } - line6 { type uniform; @@ -133,12 +138,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict index a99c2d74d0..ec2badabfb 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict @@ -59,11 +59,17 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U + alpha.water + ); sets ( @@ -107,7 +113,6 @@ functions end ( 5 0.005 0.8 ); nPoints 1001; } - line6 { type uniform; @@ -133,13 +138,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict index 2a978090c3..81bb0ab9a6 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,11 +59,18 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields + ( + U + alpha.water + ); + sets ( line1 @@ -107,7 +113,6 @@ functions end ( 7.5 0.005 1.0 ); nPoints 1001; } - line6 { type uniform; @@ -149,12 +154,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - fields - ( - U alpha.water - ); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict index e5297bac74..0dfcaaa761 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict @@ -59,10 +59,13 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); sets ( @@ -129,10 +132,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - - fields (alpha.water); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict index 6f6f182077..7d7ae721c4 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,7 +59,7 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict index 8547c84721..5c41789516 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict @@ -52,7 +52,6 @@ maxAlphaCo 0.65; maxDeltaT 0.05; - functions { line @@ -60,10 +59,13 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); sets ( @@ -130,10 +132,6 @@ functions nPoints 1001; } ); - - fixedLocations false; - - fields (alpha.water); } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict index e5297bac74..7ba2686db0 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict @@ -59,7 +59,7 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict index 686e0ab678..b5bfe00939 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict @@ -57,10 +57,9 @@ functions lineMOVING { type sets; - libs (sampling); + libs (sampling); enabled true; - writeControl writeTime; - outputInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; @@ -68,21 +67,20 @@ functions ( line1 { - type uniform; - axis distance; + type uniform; + axis distance; start ( 1.33 0.004 0.0 ); end ( 1.33 0.004 0.6 ); nPoints 101; } line2 { - type uniform; - axis distance; + type uniform; + axis distance; start ( 3.33 0.004 0.0 ); end ( 3.33 0.004 0.6 ); nPoints 101; } - ); fixedLocations false; @@ -95,10 +93,9 @@ functions lineFIXED { type sets; - libs (sampling); + libs (sampling); enabled true; - writeControl writeTime; - outputInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; @@ -106,16 +103,16 @@ functions ( line3 { - type uniform; - axis distance; + type uniform; + axis distance; start ( 5.33 0.004 0.0 ); end ( 5.33 0.004 0.6 ); nPoints 101; } line4 { - type uniform; - axis distance; + type uniform; + axis distance; start ( 5.66 0.004 0.0 ); end ( 5.66 0.004 0.6 ); nPoints 101; diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U index f4400b92b9..8aae30e0ed 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/U @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water index be5471701c..aca52b40d6 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/alpha.water @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh index 2e5c06a458..8eaf0a1284 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/0.orig/p_rgh @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict index 5c1363c36f..a79cc4085d 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/dynamicMeshDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g index 9d032f2c53..290ced5eee 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties index a0163959c3..d4fcfa9c5d 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/transportProperties +++ b/tutorials/multiphase/interIsoFoam/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/interIsoFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties index c248a5b18b..9bc049b7c7 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/constant/turbulenceProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict index 3e8d8ea545..67a1ac561e 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/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 { probes @@ -77,7 +75,7 @@ functions { type surfaces; libs (sampling); - writeControl writeTime; + writeControl onEnd; surfaceFormat raw; fields ( diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict index df13f4e670..d569ffffc0 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (1 3 2); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes index b19cf748ea..057df3add7 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/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/interIsoFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution index 13dfd7118e..413adf60ca 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -68,7 +67,6 @@ solvers smoother DICGaussSeidel; nPreSweeps 2; } - tolerance 2e-09; relTol 0; maxIter 20; diff --git a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict index 39cff1bf12..a09f27caa0 100644 --- a/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/interIsoFoam/sloshingTank2D/system/setFieldsDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U index 7bc6acf72c..424ae00870 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/U @@ -50,4 +50,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water index 62552cce51..841420a687 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/0.orig/alpha.water @@ -49,4 +49,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g index 688353da1a..8ef179a199 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/g @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties index 8d12d4c2c3..9c82b5013b 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/transportProperties +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties index 2ba9fa4efe..9bc049b7c7 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/turbulenceProperties +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/interIsoFoam/waveExampleStreamFunction/constant/waveProperties b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties index 88b372c23d..86e96553c4 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/constant/waveProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object waveProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,7 +26,7 @@ inlet waveAngle 0.0; - rampTime 3.017;//6.034; + rampTime 3.017; activeAbsorption yes; @@ -64,7 +63,6 @@ inlet 2.7580059e-004 2.2810557e-004 ); - } outlet diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict index 5177f8d76b..0eb3b2b67a 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/blockMeshDict @@ -86,4 +86,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict index ef0ef88609..6c88a52a15 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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 0.5; - functions { line @@ -61,8 +59,7 @@ functions type sets; libs (sampling); enabled true; - writeControl writeTime; - writeInterval 1; + writeControl onEnd; interpolationScheme cellPoint; setFormat raw; @@ -108,7 +105,6 @@ functions end ( 7.5 0.005 1.0 ); nPoints 1001; } - line6 { type uniform; diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict index acf0e87d15..bd5b1a36da 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 1 1); } + // ************************************************************************* // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes index 5b9e2ac730..cb9dc6c025 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution index ea39fef94f..0df413c31b 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict index ad53914da3..7c6ac00b78 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/setFieldsDict +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/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/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 2211518ee3..b03b4ca9b9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -116,10 +116,8 @@ functions log true; timeStart 0; timeEnd 1000; - executeControl timeStep; - executeInterval 1; - writeControl writeTime; - writeInterval -1; + executeControl onEnd; + writeControl onEnd; } } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict index 6651c2562e..5694a97902 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/controlDict @@ -55,11 +55,10 @@ functions minMax { - type fieldMinMax; - libs (fieldFunctionObjects); - - writeControl writeTime; + type fieldMinMax; + libs (fieldFunctionObjects); fields (U); + writeControl writeTime; } } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso index 8a5e63946b..5ff86f23b1 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleIso @@ -2,11 +2,10 @@ sampleIso { - type surfaces; - libs (sampling); - - writeControl writeTime; + type surfaces; + libs (sampling); surfaceFormat vtk; + writeControl writeTime; fields (U k epsilon nut); surfaces diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines index ac6817a667..76b64051c9 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines @@ -10,7 +10,7 @@ _sampler libs (sampling); setFormat raw; interpolationScheme cell; - writeControl writeTime; + writeControl onEnd; enabled false; sets diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes index d2b8986df9..a1756ba5ab 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/samplePlanes @@ -2,11 +2,10 @@ samplePlanes { - type surfaces; - libs (sampling); - - writeControl writeTime; + type surfaces; + libs (sampling); surfaceFormat vtk; + writeControl writeTime; fields (U k epsilon nut); surfaces