From 520001bafb2e6f9197803abf31b8e53c65782487 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 30 May 2022 13:47:49 +0200 Subject: [PATCH] TUT: use "sources" for SemiImplicit in a few places TUT: removed xxxCoeffs clutter for atmospheric sources GIT: renamed liquidFilmStepWithSprinklers --- .../reverseBurner/constant/gas/fvOptions | 8 +- .../cpuCabinet/system/v_CPU/fvOptions | 18 ++-- .../RAS/TJunction/system/controlDict | 14 ++-- .../system/controlDict | 2 +- .../setups.orig/common/constant/fvOptions | 5 +- .../filter/constant/fvOptions | 21 +++-- .../0/T | 0 .../0/U | 0 .../0/Uf_film | 0 .../0/Ydefault | 0 .../0/alphat | 0 .../0/epsilon | 0 .../0/hf_film | 0 .../0/k | 0 .../0/nut | 0 .../0/p | 0 .../0/p_rgh | 0 .../Allclean | 0 .../Allrun | 0 .../Allrun-parallel | 0 .../constant/foam.dat | 0 .../constant/foam.inp | 0 .../constant/g | 0 .../constant/reactingCloud1Properties | 0 .../constant/thermophysicalProperties | 0 .../constant/turbulenceProperties | 0 .../system/blockMeshDict | 0 .../system/controlDict | 0 .../system/decomposeParDict | 0 .../system/faMeshDefinition | 0 .../system/faSchemes | 0 .../system/faSolution | 0 .../system/fvSchemes | 0 .../system/fvSolution | 0 .../mesh/parallel/filter/system/fvOptions | 83 +++++++++---------- .../RAS/angledDuct/system/controlDict | 14 ++-- .../RAS/waterChannel/system/controlDict | 14 ++-- .../laminar/mixerVessel2D/system/controlDict | 4 +- .../laminar/injection/constant/fvOptions | 14 ++-- .../laminar/steamInjection/constant/fvOptions | 14 ++-- .../laminar/injection/constant/fvOptions | 14 ++-- .../setups.orig/kEpsilon/constant/fvOptions | 59 +++++-------- .../setups.orig/kL/constant/fvOptions | 23 ++--- .../setups.orig/kOmegaSST/constant/fvOptions | 59 +++++-------- .../setups.orig/common/constant/fvOptions | 48 ++++------- .../setups.orig/kL/constant/fvOptions | 13 ++- .../setups.orig/neutral/constant/fvOptions | 71 ++++++---------- .../slightlyStable/constant/fvOptions | 71 ++++++---------- .../slightlyUnstable/constant/fvOptions | 71 ++++++---------- .../setups.orig/stable/constant/fvOptions | 71 ++++++---------- .../setups.orig/unstable/constant/fvOptions | 73 ++++++---------- .../setups.orig/veryStable/constant/fvOptions | 74 ++++++----------- 52 files changed, 331 insertions(+), 527 deletions(-) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/T (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/U (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/Uf_film (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/Ydefault (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/alphat (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/epsilon (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/hf_film (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/k (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/nut (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/p (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/0/p_rgh (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/Allclean (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/Allrun (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/Allrun-parallel (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/foam.dat (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/foam.inp (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/g (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/reactingCloud1Properties (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/thermophysicalProperties (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/constant/turbulenceProperties (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/blockMeshDict (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/controlDict (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/decomposeParDict (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/faMeshDefinition (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/faSchemes (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/faSolution (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/fvSchemes (100%) rename tutorials/lagrangian/reactingParcelFoam/{liquidFilmStepWithSprinkles => liquidFilmStepWithSprinklers}/system/fvSolution (100%) diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions index 8939746b12..2a30e1d503 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -24,11 +24,11 @@ options duration 0.3; selectionMode cellSet; cellSet ignition; - volumeMode specific; - injectionRateSuSp + volumeMode specific; + sources { - h (2e7 0); // kg/m/s^3 + h (2e7 0); // kg/m/s^3 } } } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions index 2ef58c692c..09bd61a448 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/cpuCabinet/system/v_CPU/fvOptions @@ -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,17 +20,15 @@ v_CPU_AbsoluteEnergySource type scalarSemiImplicitSource; active true; - scalarSemiImplicitSourceCoeffs - { - selectionMode cellZone; - cellZone v_CPU; - volumeMode absolute; + selectionMode cellZone; + cellZone v_CPU; + volumeMode absolute; - injectionRateSuSp - { - h ( 100 0 ); - } + sources + { + h ( 100 0 ); } } + // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict index 887892fcde..20bfc96bdd 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/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 | | \*---------------------------------------------------------------------------*/ @@ -99,14 +99,12 @@ functions type scalarSemiImplicitSource; enabled true; - scalarSemiImplicitSourceCoeffs + selectionMode all; + volumeMode specific; + + sources { - selectionMode all; - volumeMode specific; - injectionRateSuSp - { - s (1 0); - } + s (1 0); } } } diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict index 75793ad149..883d454309 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionArrheniusBirdCarreauTransport/system/controlDict @@ -53,7 +53,7 @@ functions sTransport { type energyTransport; - libs (solverFunctionObjects); + libs (solverFunctionObjects); enabled true; writeControl writeTime; diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions index 51ff7f0be6..7ed6e6e3a4 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/setups.orig/common/constant/fvOptions @@ -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,8 @@ momentumSource selectionMode all; volumeMode specific; - injectionRateSuSp + + sources { U ((5 0 0) 0); } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions index cec5fecbb7..ab4919d88e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -44,14 +44,16 @@ massSource1 timeStart 0.2; duration 2.0; + volumeMode absolute; + selectionMode points; + points ( (2.75 0.5 0) ); - volumeMode absolute; - injectionRateSuSp + sources { rho (1e-4 0); // kg/s H2O (1e-4 0); // kg/s @@ -65,14 +67,16 @@ momentumSource1 timeStart 0.2; duration 2.0; + volumeMode absolute; + selectionMode points; + points ( (2.75 0.5 0) ); - volumeMode absolute; - injectionRateSuSp + sources { U ((0 0.005 0) 0); } @@ -85,14 +89,17 @@ energySource1 timeStart 0.2; duration 2.0; + + volumeMode absolute; + selectionMode points; + points ( (2.75 0.5 0) ); - volumeMode absolute; - injectionRateSuSp + sources { h (10 0); } diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/T b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/T rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/T diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/U b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/U rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/U diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/Uf_film b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/Uf_film rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Uf_film diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/Ydefault b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/Ydefault rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/Ydefault diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/alphat b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/alphat rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/alphat diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/epsilon rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/epsilon diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/hf_film b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/hf_film rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/hf_film diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/k b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/k rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/k diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/nut b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/nut rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/nut diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/p b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/p rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/p_rgh b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/0/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/0/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allclean b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allclean similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allclean rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allclean diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allrun b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allrun rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allrun diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allrun-parallel b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allrun-parallel similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/Allrun-parallel rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/Allrun-parallel diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/foam.dat b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/foam.dat rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.dat diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/foam.inp b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.inp similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/foam.inp rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/foam.inp diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/g b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/g rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/g diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/reactingCloud1Properties rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/thermophysicalProperties rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/constant/turbulenceProperties diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/blockMeshDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/blockMeshDict rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/controlDict rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/controlDict diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/decomposeParDict b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/decomposeParDict rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/decomposeParDict diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faMeshDefinition b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faMeshDefinition rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faMeshDefinition diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faSchemes b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faSchemes rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSchemes diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faSolution b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/faSolution rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/faSolution diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/fvSchemes rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinkles/system/fvSolution rename to tutorials/lagrangian/reactingParcelFoam/liquidFilmStepWithSprinklers/system/fvSolution diff --git a/tutorials/mesh/parallel/filter/system/fvOptions b/tutorials/mesh/parallel/filter/system/fvOptions index 51fc59b9a2..12811c0f9e 100644 --- a/tutorials/mesh/parallel/filter/system/fvOptions +++ b/tutorials/mesh/parallel/filter/system/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -47,22 +47,21 @@ massSource1 type scalarSemiImplicitSource; active yes; - scalarSemiImplicitSourceCoeffs - { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); + timeStart 0.2; + duration 2.0; + volumeMode absolute; - volumeMode absolute; - injectionRateSuSp - { - rho (1e-4 0); // kg/s - H2O (1e-4 0); // kg/s - } + selectionMode points; + + points + ( + (2.75 0.5 0) + ); + + sources + { + rho (1e-4 0); // kg/s + H2O (1e-4 0); // kg/s } } @@ -71,22 +70,20 @@ momentumSource1 { type vectorSemiImplicitSource; active yes; + timeStart 0.2; + duration 2.0; + volumeMode absolute; - vectorSemiImplicitSourceCoeffs + selectionMode points; + + points + ( + (2.75 0.5 0) + ); + + sources { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); - - volumeMode absolute; - injectionRateSuSp - { - U ((0 0.005 0) 0); - } + U ((0 0.005 0) 0); } } @@ -95,22 +92,20 @@ energySource1 { type scalarSemiImplicitSource; active yes; + timeStart 0.2; + duration 2.0; + volumeMode absolute; - scalarSemiImplicitSourceCoeffs + selectionMode points; + + points + ( + (2.75 0.5 0) + ); + + sources { - timeStart 0.2; - duration 2.0; - selectionMode points; - points - ( - (2.75 0.5 0) - ); - - volumeMode absolute; - injectionRateSuSp - { - h (10 0); - } + h (10 0); } } diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict index a41fd7f06c..1a6988cd59 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/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 | | \*---------------------------------------------------------------------------*/ @@ -78,14 +78,12 @@ functions type scalarSemiImplicitSource; enabled true; - scalarSemiImplicitSourceCoeffs + selectionMode all; + volumeMode specific; + + sources { - selectionMode all; - volumeMode specific; - injectionRateSuSp - { - s (1 0); - } + s (1 0); } } } diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict index 1dd30125cf..ba811d7c96 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/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 | | \*---------------------------------------------------------------------------*/ @@ -106,14 +106,12 @@ functions type scalarSemiImplicitSource; enabled true; - scalarSemiImplicitSourceCoeffs + selectionMode all; + volumeMode specific; + + sources { - selectionMode all; - volumeMode specific; - injectionRateSuSp - { - s (1 0); - } + s (1 0); } } } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict index 3a3ee889f4..221f1542b5 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict @@ -100,8 +100,8 @@ functions viscousDissipationCoeffs { - fields (T); - rho rho; //rho Field + fields (T); + rho rho; } } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions index b5e17d4c2e..9564b0eb1d 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - thermo:rho.air (1e-3 0); // kg/s + thermo:rho.air (1e-3 0); // kg/s } } @@ -47,9 +47,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - U.air ((0 -1e-2 0) 0); // kg*m/s^2 + U.air ((0 -1e-2 0) 0); // kg*m/s^2 } } @@ -60,9 +60,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - e.air (500 0); // kg*m^2/s^3 + e.air (500 0); // kg*m^2/s^3 } } } diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions index 2d8bd045df..7a8adac950 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - thermo:rho.steam (1.0e-3 0); // kg/s + thermo:rho.steam (1.0e-3 0); // kg/s } } /* @@ -47,9 +47,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - U.steam ((0 1e-2 0) 0); // kg*m/s^2 + U.steam ((0 1e-2 0) 0); // kg*m/s^2 } } */ @@ -60,9 +60,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - h.steam (3700 0); // kg*m^2/s^3 + h.steam (3700 0); // kg*m^2/s^3 } } } diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions index b5e17d4c2e..1a31dd5424 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -34,9 +34,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - thermo:rho.air (1e-3 0); // kg/s + thermo:rho.air (1e-3 0); // kg/s } } @@ -47,9 +47,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - U.air ((0 -1e-2 0) 0); // kg*m/s^2 + U.air ((0 -1e-2 0) 0); // kg*m/s^2 } } @@ -60,9 +60,9 @@ options $injector1; volumeMode absolute; - injectionRateSuSp + sources { - e.air (500 0); // kg*m^2/s^3 + e.air (500 0); // kg*m^2/s^3 } } } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions index 4a1f8b30ea..03515efba1 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kEpsilon/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,82 +19,61 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { - U ( ( 0 0.00197805 0 ) 0 ); + U ((0 0.00197805 0) 0); } } atmCoriolisUSource1 { type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega ( 0 0 5.65156e-05 ); - } + selectionMode all; + Omega ( 0 0 5.65156e-05 ); } atmAmbientTurbSource1 { type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 0.0001; - epsilonAmb 7.208e-08; - } + selectionMode all; + kAmb 0.0001; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 41.8; - beta 0.0033; - } + selectionMode all; + rho rho; + Lmax 41.8; + beta 0.0033; } atmLengthScaleTurbSource1 { type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 41.8; - n 3; - } + selectionMode all; + Lmax 41.8; + n 3; } atmPlantCanopyUSource1 { type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + selectionMode all; } atmPlantCanopyTSource1 { type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + selectionMode all; } atmPlantCanopyTurbSource1 { type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions index 5eb4a47145..8f13b56a9f 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kL/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,38 +19,29 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { - U ( ( 0 0.00197805 0 ) 0 ); + U ((0 0.00197805 0) 0); } } atmCoriolisUSource1 { type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega ( 0 0 5.65156e-05 ); - } + selectionMode all; + Omega ( 0 0 5.65156e-05 ); } atmPlantCanopyUSource1 { type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + selectionMode all; } atmPlantCanopyTSource1 { type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + selectionMode all; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions index 4a1f8b30ea..03515efba1 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/kOmegaSST/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,82 +19,61 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { - U ( ( 0 0.00197805 0 ) 0 ); + U ((0 0.00197805 0) 0); } } atmCoriolisUSource1 { type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega ( 0 0 5.65156e-05 ); - } + selectionMode all; + Omega ( 0 0 5.65156e-05 ); } atmAmbientTurbSource1 { type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 0.0001; - epsilonAmb 7.208e-08; - } + selectionMode all; + kAmb 0.0001; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 41.8; - beta 0.0033; - } + selectionMode all; + rho rho; + Lmax 41.8; + beta 0.0033; } atmLengthScaleTurbSource1 { type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 41.8; - n 3; - } + selectionMode all; + Lmax 41.8; + n 3; } atmPlantCanopyUSource1 { type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + selectionMode all; } atmPlantCanopyTSource1 { type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + selectionMode all; } atmPlantCanopyTurbSource1 { type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions index cc1af9e319..b3d7b4ee9a 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/common/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; selectionMode all; volumeMode specific; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -27,46 +27,34 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-5); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-5); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 41.0; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 41.0; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 41.0; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 41.0; + n 3.0; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions index 04d639d081..026fb2d91c 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/setups.orig/kL/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; selectionMode all; volumeMode specific; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -27,12 +27,9 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-5); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-5); } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions index f3427450ad..b0217a7274 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -28,80 +28,59 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 41.0; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 41.0; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 41.0; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 41.0; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions index 93ab1dc21b..ba2a574765 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -28,80 +28,59 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 25.5; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 25.5; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 25.5; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 25.5; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions index 9ff7e2b543..9a3f4bd208 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -28,80 +28,59 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 80.75; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 80.75; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 80.75; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 80.75; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions index c9b5a8eb44..6c35d3c197 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,7 +19,7 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { U ((0 1.978046e-03 0) 0); } @@ -28,80 +28,59 @@ pressureGradient atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 13.0; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 13.0; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 13.0; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 13.0; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions index e7cfb5785f..72bed69239 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,89 +19,68 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { - U ((0 1.978046e-03 0) 0); + U ((0 1.978046e-03 0) 0); } } atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 200.0; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 200.0; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 200.0; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 200.0; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; } diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions index 72a90adf74..cf67a680b0 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/constant/fvOptions @@ -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 | | \*---------------------------------------------------------------------------*/ @@ -19,89 +19,69 @@ pressureGradient type vectorSemiImplicitSource; volumeMode specific; selectionMode all; - injectionRateSuSp + sources { - U ((0 1.978046e-03 0) 0); + U ((0 1.978046e-03 0) 0); } } atmCoriolisUSource1 { - type atmCoriolisUSource; - atmCoriolisUSourceCoeffs - { - selectionMode all; - Omega (0 0 5.65156e-05); - } + type atmCoriolisUSource; + selectionMode all; + Omega (0 0 5.65156e-05); } atmAmbientTurbSource1 { - type atmAmbientTurbSource; - atmAmbientTurbSourceCoeffs - { - selectionMode all; - kAmb 1.0e-04; - epsilonAmb 7.208e-08; - } + type atmAmbientTurbSource; + selectionMode all; + kAmb 1.0e-04; + epsilonAmb 7.208e-08; } + atmBuoyancyTurbSource1 { - type atmBuoyancyTurbSource; - atmBuoyancyTurbSourceCoeffs - { - selectionMode all; - rho rho; - Lmax 5.0; - beta 3.3e-03; - } + type atmBuoyancyTurbSource; + selectionMode all; + rho rho; + Lmax 5.0; + beta 3.3e-03; } atmLengthScaleTurbSource1 { - type atmLengthScaleTurbSource; - atmLengthScaleTurbSourceCoeffs - { - selectionMode all; - Lmax 5.0; - n 3.0; - } + type atmLengthScaleTurbSource; + selectionMode all; + Lmax 5.0; + n 3.0; } atmPlantCanopyUSource1 { - type atmPlantCanopyUSource; - atmPlantCanopyUSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyUSource; + selectionMode all; } atmPlantCanopyTSource1 { - type atmPlantCanopyTSource; - atmPlantCanopyTSourceCoeffs - { - selectionMode all; - } + type atmPlantCanopyTSource; + selectionMode all; } atmPlantCanopyTurbSource1 { - type atmPlantCanopyTurbSource; - atmPlantCanopyTurbSourceCoeffs - { - selectionMode all; - rho rho; - } + type atmPlantCanopyTurbSource; + selectionMode all; + rho rho; }