From 3535b079b320527e45f3f76a4a86f7626e752645 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 26 Jun 2018 17:48:48 +0100 Subject: [PATCH] tutorials/multiphase/interFoam: Rationalized schemes and output format --- .../interFoam/RAS/angledDuct/system/controlDict | 4 ++-- .../interFoam/RAS/floatingObject/system/controlDict | 4 ++-- .../interFoam/RAS/waterChannel/system/controlDict | 4 ++-- .../interFoam/RAS/weirOverflow/system/controlDict | 4 ++-- .../interFoam/laminar/capillaryRise/system/controlDict | 2 +- .../interFoam/laminar/damBreak/damBreak/Allclean | 9 --------- .../laminar/damBreak/damBreak/system/controlDict | 4 ++-- .../laminar/damBreakWithObstacle/system/controlDict | 5 ++--- .../interFoam/laminar/mixerVessel2D/system/controlDict | 4 ++-- .../interFoam/laminar/sloshingCylinder/Allclean | 7 ------- .../laminar/sloshingCylinder/system/controlDict | 4 ++-- .../laminar/sloshingCylinder/system/fvSchemes | 6 ++++-- .../interFoam/laminar/sloshingTank2D/Allclean | 7 ------- .../laminar/sloshingTank2D/system/controlDict | 4 ++-- .../interFoam/laminar/sloshingTank2D/system/fvSchemes | 3 ++- .../interFoam/laminar/sloshingTank2D3DoF/Allclean | 7 ------- .../laminar/sloshingTank2D3DoF/system/controlDict | 4 ++-- .../laminar/sloshingTank2D3DoF/system/fvSchemes | 3 ++- .../interFoam/laminar/sloshingTank3D/Allclean | 7 ------- .../laminar/sloshingTank3D/system/controlDict | 4 ++-- .../interFoam/laminar/sloshingTank3D/system/fvSchemes | 3 ++- .../interFoam/laminar/sloshingTank3D3DoF/Allclean | 7 ------- .../laminar/sloshingTank3D3DoF/system/controlDict | 4 ++-- .../laminar/sloshingTank3D3DoF/system/fvSchemes | 3 ++- .../interFoam/laminar/sloshingTank3D6DoF/Allclean | 7 ------- .../laminar/sloshingTank3D6DoF/system/controlDict | 4 ++-- .../interFoam/laminar/testTubeMixer/Allclean | 10 ---------- .../interFoam/laminar/testTubeMixer/system/controlDict | 4 ++-- .../interFoam/laminar/testTubeMixer/system/fvSchemes | 3 ++- .../interFoam/laminar/wave/system/controlDict | 2 +- .../multiphase/interFoam/laminar/wave/system/fvSchemes | 3 ++- 31 files changed, 46 insertions(+), 100 deletions(-) delete mode 100755 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allclean delete mode 100755 tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict index a856eebf42..1a06b9518c 100644 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.1; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict index fb1e5dc227..5ba582320e 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.1; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 12; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict index 87031371c0..41fd52fa61 100644 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/system/controlDict @@ -33,11 +33,11 @@ writeInterval 5; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict index 85c6938c48..964d422682 100644 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/system/controlDict @@ -33,11 +33,11 @@ writeInterval 2; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict index 64536780d0..0c4431a087 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/controlDict @@ -37,7 +37,7 @@ writeFormat ascii; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean deleted file mode 100755 index 6b45f82a41..0000000000 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict index 1463d7df36..7064310171 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict index cb1bb78b90..54ca02afda 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.02; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; @@ -51,5 +51,4 @@ maxCo 0.5; maxAlphaCo 0.5; maxDeltaT 1; - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict index 59d2b2c2e2..b412820082 100644 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.125; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict index 413f24c791..39ae25c34c 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.02; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression yes; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes index 2d0ecbd0e1..ac83062c40 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/fvSchemes @@ -23,13 +23,15 @@ ddtSchemes gradSchemes { default Gauss linear; + grad(U) cellLimited Gauss linear 1; } divSchemes { - div(rhoPhi,U) Gauss vanLeerV; + div(rhoPhi,U) Gauss linearUpwindV grad(U); div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict index 79c11b8306..1b23a680c9 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes index 2d0ecbd0e1..25841c480b 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/system/fvSchemes @@ -29,7 +29,8 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict index 0d07abc84b..2afe5178fb 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes index 2d0ecbd0e1..25841c480b 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/system/fvSchemes @@ -29,7 +29,8 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict index 601c13ecbc..3f148bb0ce 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes index 2d0ecbd0e1..25841c480b 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/system/fvSchemes @@ -29,7 +29,8 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict index 97fff37159..ab5da49d8d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes index 2d0ecbd0e1..25841c480b 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/system/fvSchemes @@ -29,7 +29,8 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allclean deleted file mode 100755 index dc74ee4df5..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -foamCleanTutorials cases -rm -rf 0/alpha.water 0/alpha.water.gz probes wallPressure pRefProbe - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict index 97fff37159..ab5da49d8d 100644 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.05; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression compressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean b/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean deleted file mode 100755 index 8c9c9abaac..0000000000 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/Allclean +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase -rm -rf 0/alpha.water - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict index 5c345fc55e..406e643eb5 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/controlDict @@ -33,11 +33,11 @@ writeInterval 0.01; purgeWrite 0; -writeFormat ascii; +writeFormat binary; writePrecision 6; -writeCompression off; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes index 2d0ecbd0e1..25841c480b 100644 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/system/fvSchemes @@ -29,7 +29,8 @@ divSchemes { div(rhoPhi,U) Gauss vanLeerV; div(phi,alpha) Gauss vanLeer; - div(phirb,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/controlDict b/tutorials/multiphase/interFoam/laminar/wave/system/controlDict index 2e359aee64..efb1c9bda1 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/controlDict +++ b/tutorials/multiphase/interFoam/laminar/wave/system/controlDict @@ -37,7 +37,7 @@ writeFormat binary; writePrecision 6; -writeCompression uncompressed; +writeCompression no; timeFormat general; diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/wave/system/fvSchemes index 9d964c4537..11c6984425 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/wave/system/fvSchemes @@ -33,9 +33,10 @@ gradSchemes divSchemes { - div(rhoPhi,U) Gauss linearUpwindV grad(U); + div(rhoPhi,U) Gauss linearUpwindV grad(U); div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; }