From 8a7221cf504dbc26c03e42185c51b6c40adc5ff6 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 4 Mar 2022 11:22:08 +0100 Subject: [PATCH] TUT: update tutorials to use dictionary-style sets - can now specify sampled sets as dictionary entries instead of a list entry. can now use: sets { ... } instead of: sets ( ... ); This is similar to sampled surfaces and makes it easier to manage with dictionary manipulation tools. TUT: update to use writeTime instead of outputTime --- .../RAS/SandiaD_LTS/system/sampleDict | 18 ++--- .../biconic25-55Run35/system/sample | 7 +- .../injectorPipe/system/scalarTransport | 2 +- .../injectorPipe/system/surfaceFieldValue.cfg | 2 +- .../squareBend/system/sampleCellCentres | 4 +- .../sonicFoam/laminar/shockTube/system/sample | 7 +- .../mhdFoam/hartmann/system/sample | 11 ++- .../hotRoom/system/controlDict | 2 +- .../buoyantCavity/system/sample | 7 +- .../jouleHeatingSolid/system/controlDict | 8 +- .../solidQuenching2D/system/controlDict | 4 +- .../aeroFoil_overset/system/controlDict | 4 +- .../periodicHill/transient/system/controlDict | 4 +- .../setups.orig/common/system/sample | 4 +- .../setups.orig/common/system/sampleCf | 5 +- .../surfaceMountedCube/fullCase/system/sample | 6 +- .../RAS/TJunction/system/controlDict | 2 +- .../system/controlDict | 2 +- .../laminar/planarContraction/system/graphs | 7 +- .../setups.orig/common/system/singleGraph | 4 +- .../backwardFacingStep2D/system/sample | 11 ++- .../simpleCar/system/referencePressure | 6 +- .../reactingParcelFoam/filter/system/sample | 7 +- .../system/controlDict | 12 +-- .../RAS/angledDuct/system/controlDict | 2 +- .../system/FOelectricPotential | 2 +- .../RAS/waterChannel/system/controlDict | 2 +- .../damBreak/damBreak/system/controlDict | 7 +- .../laminar/damBreak/damBreak/system/sampling | 76 ++++++++----------- .../laminar/waves/cnoidal/system/controlDict | 6 +- .../system/controlDict | 6 +- .../mangroveInteraction/system/controlDict | 6 +- .../laminar/waves/solitary/system/controlDict | 6 +- .../waves/solitaryGrimshaw/system/controlDict | 12 +-- .../waves/solitaryMcCowan/system/controlDict | 13 ++-- .../laminar/waves/stokesI/system/controlDict | 6 +- .../laminar/waves/stokesII/system/controlDict | 6 +- .../laminar/waves/stokesV/system/controlDict | 6 +- .../waves/streamFunction/system/controlDict | 6 +- .../waves/waveMakerFlap/system/controlDict | 6 +- .../system/controlDict | 14 ++-- .../system/controlDict | 6 +- .../waves/waveMakerPiston/system/controlDict | 13 ++-- .../waveMakerSolitary/system/controlDict | 37 ++++----- .../system/controlDict | 19 ++--- .../laminar/mixerVessel2D/system/controlDict | 2 +- .../setups.orig/common/system/sampleLines | 4 +- .../setups.orig/common/system/sampleLines | 4 +- .../setups.orig/common/system/samples | 4 +- .../divergenceExample/system/controlDict | 12 +-- .../setups.orig/common/system/sample | 7 +- .../setups.orig/common/system/sampleEpsilon | 7 +- .../setups.orig/common/system/sampleG | 7 +- .../common/system/runtimePostProcessing | 15 ++-- .../common/system/sampleCellPatchConstrained | 4 +- .../setups.orig/common/system/sampleCellPoint | 4 +- 56 files changed, 234 insertions(+), 239 deletions(-) diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict index 8122dc3638..83a9f04375 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/sampleDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -78,7 +78,7 @@ fields // uniform: extra number of sampling points // curve, cloud: list of coordinates sets -( +{ Centerline { type uniform; @@ -99,7 +99,7 @@ sets nPoints 100; } Radial_15 - { + { type uniform; axis distance; @@ -108,7 +108,7 @@ sets nPoints 100; } Radial_30 - { + { type uniform; axis distance; @@ -117,7 +117,7 @@ sets nPoints 100; } Radial_45 - { + { type uniform; axis distance; @@ -126,7 +126,7 @@ sets nPoints 100; } Radial_60 - { + { type uniform; axis distance; @@ -135,7 +135,7 @@ sets nPoints 100; } Radial_75 - { + { type uniform; axis distance; @@ -143,7 +143,7 @@ sets end (0.080 0 0.54); nPoints 100; } -); +} // Surface sampling definition: choice of @@ -153,7 +153,7 @@ sets // 1] patches are not triangulated by default // 2] planes are always triangulated // 3] iso-surfaces are always triangulated -surfaces (); +surfaces {} // *********************************************************************** // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample index 1fbd6acf22..539e043402 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -18,10 +18,11 @@ type sets; libs (sampling); interpolationScheme cellPointFace; setFormat raw; + fields ( p wallHeatTransRate ); sets -( +{ cone25 { type face; @@ -46,7 +47,7 @@ sets end (0.193675 0.13092 0); nPoints 40; } -); +} // ************************************************************************* // diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport index 4d30d95982..d4d4874252 100644 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport @@ -7,7 +7,7 @@ tracer0 log off; resetOnStartUp false; - // writeControl outputTime; + // writeControl writeTime; // writeInterval 1; field tracer0; D 0.001; diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFieldValue.cfg b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFieldValue.cfg index 6dce8f7ad8..28395bbf01 100644 --- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFieldValue.cfg +++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFieldValue.cfg @@ -24,7 +24,7 @@ __settings_avg enabled true; executeControl timeStep; - writeControl outputTime; + writeControl writeTime; writeInterval 1; // restart behaviour diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampleCellCentres b/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampleCellCentres index b01df4c868..870257ec52 100644 --- a/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampleCellCentres +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/system/sampleCellCentres @@ -19,7 +19,7 @@ sampleSets fields ( U ); sets - ( + { centres { type cellCentre; @@ -28,7 +28,7 @@ sampleSets // bounds (-0.2 -1 -1) (-0.195 0 1); bounds (-0.025 -1 -1) (-0.0225 0 1); // single cell layer } - ); + } } diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample index b58a34f2b6..9b996af1db 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -18,10 +18,11 @@ type sets; libs (sampling); interpolationScheme cellPoint; setFormat raw; + fields (T mag(U) p); sets -( +{ data { type uniform; @@ -30,7 +31,7 @@ sets end (4.995 0 0); nPoints 1000; } -); +} // ************************************************************************* // diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample index 5435e26bc6..5954fe9238 100644 --- a/tutorials/electromagnetics/mhdFoam/hartmann/system/sample +++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -21,8 +21,10 @@ interpolationScheme cellPoint; setFormat raw; +fields ( Ux ); + sets -( +{ line_centreProfile { type uniform; @@ -31,9 +33,6 @@ sets end (10.001 1 0.01); nPoints 100; } -); - -fields ( Ux ); - +} // ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict index 7995727984..de6d6d486a 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/controlDict @@ -55,7 +55,7 @@ functions type heatTransferCoeff; libs (fieldFunctionObjects); field T; - writeControl outputTime; + writeControl writeTime; writeInterval 1; htcModel fixedReferenceTemperature; patches (ceiling); diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample index 0ff9a268dd..1f53f6a7a7 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -18,10 +18,11 @@ type sets; libs (sampling); interpolationScheme cellPointFace; setFormat raw; + fields ( T U ); sets -( +{ y0.1 { type face; @@ -85,7 +86,7 @@ sets start (-1 1.962 0); end (1 1.962 0); } -); +} // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict index 1f14a0062c..eec09d8973 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -50,14 +50,14 @@ functions { type sets; libs (sampling); - writeControl outputTime; + writeControl writeTime; region solid; fields (T jouleHeatingSource:V jouleHeatingSource:sigma); interpolationScheme cellPoint; setFormat raw; sets - ( + { centreLine { type uniform; @@ -66,7 +66,7 @@ functions end ( 2.5 0.05 0.05); nPoints 20; } - ); + } } } diff --git a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict index a71f39ecf6..d0d3350afb 100644 --- a/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionTwoPhaseEulerFoam/solidQuenching2D/system/controlDict @@ -66,7 +66,7 @@ functions libs (reactingEulerFoamFunctionObjects); region water; field T.liquid; - writeControl outputTime; + writeControl writeTime; writeInterval 1; htcModel fixedReferenceTemperature; patches (water_to_solid); @@ -80,7 +80,7 @@ functions log on; enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; writeFields false; diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict index 7801e98874..d04652a115 100644 --- a/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict +++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_overset/system/controlDict @@ -50,8 +50,8 @@ functions { type forces; libs (forces); - outputControl timeStep; - outputInterval 10; + writeControl timeStep; + writeInterval 10; patches (wing); pName p; UName U; diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict index 75193c447f..df61d2f9a7 100644 --- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/controlDict @@ -118,7 +118,7 @@ functions ); sets - ( + { xbyh0.05 { type face; @@ -189,7 +189,7 @@ functions start (0.224 0 0.063); end (0.224 1 0.063); } - ); + } } } diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sample b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sample index 1b802ae489..b1e6105386 100644 --- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sample +++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sample @@ -12,7 +12,7 @@ fields ); sets -( +{ inletPatch { type face; @@ -208,7 +208,7 @@ sets end (37.7 2.0 1.57); nPoints 200; } -); +} // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf index 02cabfc87f..f4db58fead 100644 --- a/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf +++ b/tutorials/incompressible/pimpleFoam/LES/planeChannel/setups.orig/common/system/sampleCf @@ -4,6 +4,7 @@ type sets; libs (sampling); interpolationScheme cellPatchConstrained; setFormat raw; + fields ( CfMean ); _planes @@ -17,7 +18,7 @@ _planes } sets -( +{ // Intersections of patches with plane planeAA { @@ -28,7 +29,7 @@ sets normal ( 0 0 1 ); } } -); +} // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample index f19b37c3e5..31ece34d85 100644 --- a/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample +++ b/tutorials/incompressible/pimpleFoam/LES/surfaceMountedCube/fullCase/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ setFormat raw; fields ( U UMean ); sets -( +{ xm10 { type face; @@ -115,7 +115,7 @@ sets start (8.5 4.5 0); end (8.5 4.5 2); } -); +} // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict index 01f07767e3..887892fcde 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict @@ -85,7 +85,7 @@ functions libs (solverFunctionObjects); enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; field s; diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict index 723d5cbb84..75793ad149 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict @@ -56,7 +56,7 @@ functions libs (solverFunctionObjects); enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; field T; diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs index f9180dc974..e4c8c3c94f 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs +++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs @@ -15,6 +15,8 @@ interpolationScheme cellPoint; setFormat raw; +fields (U); + setConfig { type midPoint; // midPoint @@ -22,7 +24,7 @@ setConfig } sets -( +{ lineA { $setConfig; @@ -43,8 +45,7 @@ sets start (-0.032 0 0); end (-0.032 0.0128 0); } -); +} -fields (U); // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/singleGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/singleGraph index 6b3edf25f9..f3c9050077 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/singleGraph +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/system/singleGraph @@ -17,14 +17,14 @@ setConfig } sets -( +{ line { $setConfig; start (0 0 0); end (0 1 0); } -); +} // ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample index 5b1a16fa66..15ea998c59 100644 --- a/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample +++ b/tutorials/incompressible/simpleFoam/backwardFacingStep2D/system/sample @@ -1,3 +1,5 @@ +// -*- C++ -*- + type sets; libs (sampling); @@ -7,8 +9,10 @@ interpolationScheme cellPoint; setFormat raw; +fields (p U turbulenceProperties:devReff); + sets -( +{ Uref { type cloud; @@ -56,6 +60,7 @@ sets end (0.127 0.1016 0); nPoints 100; } -); +} -fields (p U turbulenceProperties:devReff); + +// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure index 070790e3f5..693a5191eb 100644 --- a/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure +++ b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -15,7 +15,7 @@ sample1 fields ( p ); sets - ( + { cloud { type cloud; @@ -29,7 +29,7 @@ sample1 (1 1.0 0.05) ); } - ); + } } average1 diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/sample b/tutorials/lagrangian/reactingParcelFoam/filter/system/sample index 1c66955110..a4a1496949 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/system/sample +++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/sample @@ -5,7 +5,7 @@ sample1 type sets; libs (sampling); setFormat gltf; - + writeControl writeTime; interpolationScheme cellPointFace; formatOptions @@ -25,10 +25,9 @@ sample1 } fields ( p T k epsilon U ); - writeControl writeTime; sets - ( + { line { type face; @@ -41,7 +40,7 @@ sample1 { type cellCentre; } - ); + } } diff --git a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict index 583d925aaa..d03ac9d863 100644 --- a/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict +++ b/tutorials/mesh/snappyHexMesh/motorBike_leakDetection/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -77,8 +77,11 @@ functions interpolationScheme cell; setFormat vtk; + // Needs at least one field + fields ( processorID ); + sets - ( + { leakFind { type shortestPath; @@ -86,10 +89,7 @@ functions outsidePoints ((1 0 1.3)); axis xyz; } - ); - - // Needs at least one field - fields ( processorID ); + } } } diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict index 2bb922e5e2..a41fd7f06c 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict @@ -60,7 +60,7 @@ functions libs (solverFunctionObjects); enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; field s; diff --git a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential index 1be122d2e1..1e710e7bd3 100644 --- a/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential +++ b/tutorials/multiphase/interFoam/RAS/electrostaticDeposition/system/FOelectricPotential @@ -44,7 +44,7 @@ electricPotential timeEnd 100; executeControl timeStep; executeInterval 1; - writeControl outputTime; + writeControl writeTime; writeInterval -1; } diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict index e4f8e84aaf..1dd30125cf 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict @@ -90,7 +90,7 @@ functions libs (solverFunctionObjects); enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; field s; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict index 3aeb9550a8..fa175fb63f 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -52,7 +52,10 @@ maxAlphaCo 1; maxDeltaT 1; -#sinclude "sampling" +functions +{ + #sinclude "sampling" +} // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling index 1dbea47e7f..8266bea4e8 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/sampling @@ -1,53 +1,37 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object sampling; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// -*- C++ -*- -functions +sampleSets { - sampleSets + type sets; + libs (sampling); + + writeControl timeStep; + writeInterval 1; + + setFormat vtk; + interpolationScheme cellPointFace; + + fields ( alpha.water ); + + sets { - type sets; - libs (sampling); + gauge_1 + { + type face; + axis y; + start (0.02 0.20 0.005); + end (0.02 0.25 0.005); + nPoints 100; + } - writeControl timeStep; - writeInterval 1; - - setFormat vtk; - interpolationScheme cellPointFace; - fields ( alpha.water ); - - sets - ( - gauge_1 - { - type face; - axis y; - start (0.02 0.20 0.005); - end (0.02 0.25 0.005); - nPoints 100; - } - - gauge_2 - { - type face; - axis y; - start (0.2 0.03 0.005); - end (0.2 0.55 0.005); - nPoints 100; - } - ); + gauge_2 + { + type face; + axis y; + start (0.2 0.03 0.005); + end (0.2 0.55 0.005); + nPoints 100; + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict index f3c6086b4b..a997eb9e54 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/cnoidal/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -137,7 +137,7 @@ functions end ( 14.0 0.005 0.8 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict index c15e81de65..4d893d6b83 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/irregularMultiDirection/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -71,7 +71,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -80,7 +80,7 @@ functions end ( 7.9253 19.8599 30.0 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict index a4f785be00..94698ed0a6 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/mangroveInteraction/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -75,7 +75,7 @@ functions ); sets - ( + { s1 { type uniform; @@ -156,7 +156,7 @@ functions end ( 4.77 0.275 0.5 ); nPoints 101; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict index 7e7d30dfd2..36f1367a94 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitary/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -71,7 +71,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -120,7 +120,7 @@ functions end ( 9.0 0.01 1.5 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict index 98860b0d53..a819e8b7d5 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryGrimshaw/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -63,9 +63,12 @@ functions interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); sets - ( + { s1 { type uniform; @@ -128,10 +131,7 @@ functions end ( 6.15 0.275 0.5 ); nPoints 101; } - ); - - fixedLocations false; - fields (alpha.water); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict index 96c6440c66..a819e8b7d5 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/solitaryMcCowan/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -63,9 +63,12 @@ functions interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); sets - ( + { s1 { type uniform; @@ -128,11 +131,7 @@ functions end ( 6.15 0.275 0.5 ); nPoints 101; } - ); - - fixedLocations false; - - fields (alpha.water); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict index 0cdc7485b5..95d69aa058 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesI/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -137,7 +137,7 @@ functions end ( 14.0 0.005 0.75 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict index 5c3d669266..f47030f51e 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesII/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -137,7 +137,7 @@ functions end ( 14.0 0.005 0.55 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict index b6c9355977..ce9b7a0e56 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/stokesV/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -137,7 +137,7 @@ functions end ( 9.0 0.005 0.8 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict index dfc622485c..9827fa984a 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/streamFunction/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -72,7 +72,7 @@ functions ); sets - ( + { line1 { type uniform; @@ -153,7 +153,7 @@ functions end ( 28.0 0.005 1.0 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict index 9d0acae8e3..e3b246b521 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerFlap/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -68,7 +68,7 @@ functions fields (alpha.water); sets - ( + { s1 { type uniform; @@ -131,7 +131,7 @@ functions end ( 4.0 0.005 0.7 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict index 9bf2e48d47..bc66fccfad 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -64,8 +64,12 @@ functions interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); + sets - ( + { s1 { type uniform; @@ -128,11 +132,7 @@ functions end ( 4.0 0.005 0.7 ); nPoints 1001; } - ); - - fixedLocations false; - - fields (alpha.water); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict index 9c5c698540..626fe7f521 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -68,7 +68,7 @@ functions fields (alpha.water); sets - ( + { s1 { type uniform; @@ -131,7 +131,7 @@ functions end ( 4.0 0.005 0.7 ); nPoints 1001; } - ); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict index ce1e13bf5a..0db97ecd2a 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerPiston/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -63,9 +63,12 @@ functions interpolationScheme cellPoint; setFormat raw; + fixedLocations false; + + fields (alpha.water); sets - ( + { s1 { type uniform; @@ -128,11 +131,7 @@ functions end ( 4.0 0.005 0.7 ); nPoints 1001; } - ); - - fixedLocations false; - - fields (alpha.water); + } } } diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict index 55b30ae2b9..b71419387b 100644 --- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerSolitary/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -63,8 +63,15 @@ functions interpolationScheme cellPoint; setFormat raw; - sets + fixedLocations false; + + fields ( + p p_rgh U alpha.water + ); + + sets + { line1 { type uniform; @@ -81,13 +88,7 @@ functions end ( 3.33 0.004 0.6 ); nPoints 101; } - ); - - fixedLocations false; - fields - ( - p p_rgh U alpha.water - ); + } } lineFIXED @@ -96,11 +97,17 @@ functions libs (sampling); enabled true; writeControl onEnd; - interpolationScheme cellPoint; setFormat raw; - sets + fixedLocations true; + + fields ( + p p_rgh U alpha.water + ); + + sets + { line3 { type uniform; @@ -117,13 +124,7 @@ functions end ( 5.66 0.004 0.6 ); nPoints 101; } - ); - - fixedLocations true; - fields - ( - p p_rgh U alpha.water - ); + } } } diff --git a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict index b154d0277a..f8fbf19ac2 100644 --- a/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict +++ b/tutorials/multiphase/interIsoFoam/waveExampleStreamFunction/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -63,8 +63,15 @@ functions interpolationScheme cellPoint; setFormat raw; - sets + fixedLocations false; + + fields ( + U alpha.water + ); + + sets + { line1 { type uniform; @@ -145,13 +152,7 @@ functions end ( 28.0 0.005 1.0 ); nPoints 1001; } - ); - - fixedLocations false; - fields - ( - U alpha.water - ); + } } } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict index 6cd4924272..3a3ee889f4 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict @@ -59,7 +59,7 @@ functions type energyTransport; libs (solverFunctionObjects); enabled true; - writeControl outputTime; + writeControl writeTime; writeInterval 1; write true; diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines index 76b64051c9..337bd7c47b 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines +++ b/tutorials/verificationAndValidation/atmosphericModels/atmDownstreamDevelopment/setups.orig/common/system/sampleLines @@ -14,7 +14,7 @@ _sampler enabled false; sets - ( + { x_0mPatch // inlet patch face centres { type face; @@ -57,7 +57,7 @@ _sampler start (5000 50 0); end (5000 50 500); } - ); + } } samples_u diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/sampleLines b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/sampleLines index b7310e1760..398eefb739 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/sampleLines +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/system/sampleLines @@ -10,7 +10,7 @@ writeControl writeTime; fields (U); sets -( +{ lineZ1 { type midPoint; @@ -19,7 +19,7 @@ sets end (0 0 6001); nPoints 200; } -); +} // *********************************************************************** // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples index ddbdb8ed88..4d1c4972ee 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/system/samples @@ -19,7 +19,7 @@ fields ); sets -( +{ lineZ1 { type midPoint; @@ -28,7 +28,7 @@ sets end (0 0 6001); nPoints 200; } -); +} // *********************************************************************** // diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict index 3860b7f15c..9993b68b24 100644 --- a/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict +++ b/tutorials/verificationAndValidation/schemes/divergenceExample/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -52,8 +52,12 @@ functions libs (sampling); writeControl onEnd; setFormat raw; + interpolationScheme cellPoint; + + fields (T); + sets - ( + { line1 { type uniform; @@ -64,9 +68,7 @@ functions end (1 0 0.00501); nPoints 200; } - ); - interpolationScheme cellPoint; - fields (T); + } } } diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample index 1dddaba802..d4ae0ff770 100644 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sample @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -20,6 +20,7 @@ interpolationScheme cellPoint; setFormat raw; executeControl writeTime; writeControl writeTime; + fields ( U @@ -28,7 +29,7 @@ fields ); sets -( +{ ref_point { type cloud; @@ -43,7 +44,7 @@ sets start (0.5 0 0.5); end (0.5 1 0.5); } -); +} // ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon index bdec64f6ab..b58dd58b48 100644 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleEpsilon @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -20,13 +20,14 @@ interpolationScheme cellPoint; setFormat raw; executeControl writeTime; writeControl writeTime; + fields ( turbulenceProperties:epsilon ); sets -( +{ y { type midPoint; @@ -34,7 +35,7 @@ sets start (0.5 0 0.5); end (0.5 1 0.5); } -); +} // ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG index dfe9cac7ce..d8aa58a9e8 100644 --- a/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG +++ b/tutorials/verificationAndValidation/schemes/nonOrthogonalChannel/setups.orig/common/system/sampleG @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2112 | +| \\ / O peration | Version: v2206 | | \\ / A nd | Website: www.openfoam.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -20,13 +20,14 @@ interpolationScheme cellPoint; setFormat raw; executeControl writeTime; writeControl writeTime; + fields ( productionRate ); sets -( +{ y { type midPoint; @@ -34,7 +35,7 @@ sets start (0.5 0 0.5); end (0.5 1 0.5); } -); +} // ************************************************************************* // diff --git a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/runtimePostProcessing b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/runtimePostProcessing index 3f9fc664cb..2f69ac7ddd 100644 --- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/runtimePostProcessing +++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/runtimePostProcessing @@ -2,15 +2,8 @@ postPro1 { - type runTimePostProcessing; - functionObjectLibs (runTimePostProcessing); - outputControl outputTime; - output - { - name image; - width 1000; - height 1000; - } + #includeEtc "caseDicts/postProcessing/visualization/runTimePostPro.cfg" + camera { // If camera is moving, optionally provide start and end times @@ -47,9 +40,11 @@ postPro1 surface (0.5 0.5 0.5); line (1 0 0); } + // Line data lines {} + // Surface data surfaces { @@ -79,4 +74,4 @@ postPro1 } -// ************************************************************************* // \ No newline at end of file +// ************************************************************************* // diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPatchConstrained b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPatchConstrained index ad7ff9cf25..9debf990b3 100644 --- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPatchConstrained +++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPatchConstrained @@ -13,7 +13,7 @@ fields ); sets -( +{ inletPatch { type face; @@ -29,7 +29,7 @@ sets start (0.062832 0 1.57); end (0.062832 2 1.57); } -); +} // ************************************************************************* // diff --git a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPoint b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPoint index 6bbbf5ceee..e8256847d3 100644 --- a/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPoint +++ b/tutorials/verificationAndValidation/turbulentInflow/oneCellThickPlaneChannel/setups.orig/common/system/sampleCellPoint @@ -13,7 +13,7 @@ fields ); sets -( +{ inletPatch { type face; @@ -29,7 +29,7 @@ sets start (0.062832 0 1.57); end (0.062832 2 1.57); } -); +} // ************************************************************************* //