diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions index fd0d7c371e..3eed2bab52 100644 --- a/bin/tools/CleanFunctions +++ b/bin/tools/CleanFunctions @@ -78,7 +78,7 @@ cleanCase() rm -rf VTK > /dev/null 2>&1 rm -rf sequencedVTK > /dev/null 2>&1 - rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition + rm -f 0/polyMesh 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition if [ -e system/blockMeshDict.m4 ] then diff --git a/tutorials/basic/potentialFoam/cylinder/0.orig/U b/tutorials/basic/potentialFoam/cylinder/0/U.orig similarity index 100% rename from tutorials/basic/potentialFoam/cylinder/0.orig/U rename to tutorials/basic/potentialFoam/cylinder/0/U.orig diff --git a/tutorials/basic/potentialFoam/cylinder/0.orig/p b/tutorials/basic/potentialFoam/cylinder/0/p.orig similarity index 100% rename from tutorials/basic/potentialFoam/cylinder/0.orig/p rename to tutorials/basic/potentialFoam/cylinder/0/p.orig diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean index 5734444f4e..e7d07c89d3 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allclean +++ b/tutorials/basic/potentialFoam/cylinder/Allclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -rf 0 > /dev/null 2>&1 +find 0 -type f ! -name "*.*" -delete > /dev/null 2>&1 cleanCase diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun index aab0381e87..6dad238434 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allrun +++ b/tutorials/basic/potentialFoam/cylinder/Allrun @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory application=`getApplication` -cp -r 0.orig 0 > /dev/null 2>&1 runApplication blockMesh runApplication $application -withFunctionObjects -writePhi -writep runApplication postProcess -func streamFunction diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.orig/U b/tutorials/basic/potentialFoam/pitzDaily/0/U.orig similarity index 100% rename from tutorials/basic/potentialFoam/pitzDaily/0.orig/U rename to tutorials/basic/potentialFoam/pitzDaily/0/U.orig diff --git a/tutorials/basic/potentialFoam/pitzDaily/0.orig/p b/tutorials/basic/potentialFoam/pitzDaily/0/p.orig similarity index 100% rename from tutorials/basic/potentialFoam/pitzDaily/0.orig/p rename to tutorials/basic/potentialFoam/pitzDaily/0/p.orig diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean index 5734444f4e..e7d07c89d3 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allclean +++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -rf 0 > /dev/null 2>&1 +find 0 -type f ! -name "*.*" -delete > /dev/null 2>&1 cleanCase diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun index 7adc4a3f14..9b0007f46e 100755 --- a/tutorials/basic/potentialFoam/pitzDaily/Allrun +++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory application=`getApplication` -cp -r 0.orig 0 > /dev/null 2>&1 runApplication blockMesh runApplication $application -writePhi -writep runApplication postProcess -func streamFunction diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/U rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/U diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/alpha.vapour rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/alpha.vapour diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/k rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/k diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/nut rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/nut diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/p rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/p diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/polyMesh/cellMap b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/polyMesh/cellMap new file mode 100644 index 0000000000..ea59deeaa1 Binary files /dev/null and b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/polyMesh/cellMap differ diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho similarity index 100% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/0.orig/rho rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/0/rho diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean index d1fd91d5d3..2fab81ad38 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allclean @@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -rf constant/polyMesh/sets > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1 -rm -rf processor[0-9] > /dev/null 2>&1 cleanCase #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun index ad45a087f6..ec3c2cd53c 100755 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/Allrun @@ -25,8 +25,6 @@ refineMeshByCellSet() done } -cp -r 0.orig 0 - runApplication blockMesh refineMeshByCellSet 1 2 3 diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/T similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/T rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/T diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/U similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/U rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/U diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/alpha.liquid.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/alpha.liquid rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/alpha.liquid.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/p_rgh rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/p_rgh diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/sigma.liquid similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0.orig/sigma.liquid rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/0/sigma.liquid diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean index 7bafa25531..33f2b485f2 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean @@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase -rm -rf 0 2> /dev/null +rm -rf 0/T.* #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun index f182e99ff0..c0b6bd3a72 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun @@ -10,8 +10,6 @@ application=`getApplication` runApplication blockMesh runApplication extrudeMesh -rm -rf 0 2> /dev/null -cp -r 0.orig 0 runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.air b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.air new file mode 100644 index 0000000000..865374d8b6 Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.air differ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/T rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.water new file mode 100644 index 0000000000..82f5c6969c Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/T.water differ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/U rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/U diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/alpha.water rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/alpha.water.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0.orig/p_rgh rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/0/p_rgh.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean deleted file mode 100755 index 9f691c9385..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allclean +++ /dev/null @@ -1,11 +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 - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun index 9634609e90..ed61ac5435 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun @@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication blockMesh -cp -r 0.orig 0 runApplication setFields runApplication $(getApplication) diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution index 9441d0f5ed..b852c8ab23 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/fvSolution @@ -99,8 +99,8 @@ PIMPLE { momentumPredictor no; transonic no; - nOuterCorrectors 1; - nCorrectors 2; + nOuterCorrectors 3; + nCorrectors 1; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/T rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/T.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/U rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/U diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/alpha.water rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/alpha.water.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.orig similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0.orig/p_rgh rename to tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/0/p_rgh.orig diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean deleted file mode 100755 index a180eaa28b..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allclean +++ /dev/null @@ -1,12 +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 -rm -rf processor* - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun index e7993bc061..c6c14fb6a9 100755 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun @@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication blockMesh -cp -r 0.orig 0 runApplication setFields runApplication decomposePar runParallel $(getApplication) diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution index 762b44fad0..b1bec5a301 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/fvSolution @@ -99,8 +99,8 @@ PIMPLE { momentumPredictor no; transonic no; - nOuterCorrectors 1; - nCorrectors 2; + nOuterCorrectors 2; + nCorrectors 1; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas deleted file mode 100644 index 10e3ea7a07..0000000000 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type zeroGradient; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/T similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/T rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/T diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/U similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/U rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/U diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.air.orig diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.mercury.orig diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.oil.orig diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/alpha.water.orig diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh similarity index 100% rename from tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh rename to tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0/p_rgh diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean index 9f691c9385..80f251ae72 100755 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 +rm -rf 0/T.* 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun index e909a02e90..16823adae6 100755 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict index b277afb1c5..39b2cf58b3 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict @@ -21,7 +21,6 @@ defaultFieldValues volScalarFieldValue alpha.water 0 volScalarFieldValue alpha.oil 0 volScalarFieldValue alpha.mercury 0 - volVectorFieldValue U (0 0 0) ); regions diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHull/0/U similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/U rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/U diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHull/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/alpha.water rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/alpha.water.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHull/0/k similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/k rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/k diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHull/0/nut similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/nut diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHull/0/omega similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/omega rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/omega diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/p_rgh rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHull/0/pointDisplacement similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHull/0.orig/pointDisplacement rename to tutorials/multiphase/interFoam/RAS/DTCHull/0/pointDisplacement diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0/polyMesh/cellMap b/tutorials/multiphase/interFoam/RAS/DTCHull/0/polyMesh/cellMap new file mode 100644 index 0000000000..43cf22acc6 Binary files /dev/null and b/tutorials/multiphase/interFoam/RAS/DTCHull/0/polyMesh/cellMap differ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean index e3e304dace..359e234386 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean @@ -11,7 +11,6 @@ rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase rm constant/polyMesh/boundary > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun index 1fc448e545..ea7bf18578 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun @@ -22,9 +22,6 @@ done runApplication snappyHexMesh -overwrite -rm -rf 0 -cp -r 0.orig 0 - runApplication setFields runApplication decomposePar diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/U rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/alpha.water rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/alpha.water.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/k rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/k diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/nut diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/omega rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/omega diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/p_rgh rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/0.orig/pointDisplacement rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/pointDisplacement diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/polyMesh/cellMap b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/polyMesh/cellMap new file mode 100644 index 0000000000..43cf22acc6 Binary files /dev/null and b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/polyMesh/cellMap differ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean index e3e304dace..1416cad21f 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean @@ -4,14 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -# remove surface +# Remove surface rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase -rm constant/polyMesh/boundary > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun index 1fc448e545..ea7bf18578 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun @@ -22,9 +22,6 @@ done runApplication snappyHexMesh -overwrite -rm -rf 0 -cp -r 0.orig 0 - runApplication setFields runApplication decomposePar diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/U b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/U rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/alpha.water rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/alpha.water.orig diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/k b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/k similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/k rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/k diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/nut b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/nut similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/nut diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/omega b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/omega similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/omega rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/omega diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/p_rgh rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/pointDisplacement similarity index 100% rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/0.orig/pointDisplacement rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/0/pointDisplacement diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/polyMesh/cellMap b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/polyMesh/cellMap new file mode 100644 index 0000000000..8633caaf31 Binary files /dev/null and b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/polyMesh/cellMap differ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean index e3e304dace..359e234386 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean @@ -11,7 +11,6 @@ rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 cleanCase rm constant/polyMesh/boundary > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1 #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun index ed59c5be44..4984156781 100755 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun @@ -23,9 +23,6 @@ done runApplication snappyHexMesh -overwrite -rm -rf 0 -cp -r 0.orig 0 - runApplication setWaves -alpha alpha.water runApplication decomposePar @@ -35,3 +32,5 @@ runParallel renumberMesh -overwrite runParallel $(getApplication) runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U b/tutorials/multiphase/interFoam/RAS/floatingObject/0/U similarity index 100% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/U rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/U diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/floatingObject/0/alpha.water.orig similarity index 97% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/alpha.water.orig index e09e2739bd..c21c71c474 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0/alpha.water.orig @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alpha.water; + object alpha.water.orig; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/floatingObject/0/epsilon similarity index 100% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/epsilon rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/epsilon diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k b/tutorials/multiphase/interFoam/RAS/floatingObject/0/k similarity index 100% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/k rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/k diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut b/tutorials/multiphase/interFoam/RAS/floatingObject/0/nut similarity index 100% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/nut diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh similarity index 80% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh index 7602ec8372..ffeef04314 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0/p_rgh @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -23,16 +24,25 @@ boundaryField stationaryWalls { type fixedFluxPressure; + gradient uniform 0; + value uniform 0; } atmosphere { type totalPressure; + rho rho; + psi none; + gamma 1; p0 uniform 0; + value uniform 0; } floatingObject { type fixedFluxPressure; + gradient uniform 0; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement b/tutorials/multiphase/interFoam/RAS/floatingObject/0/pointDisplacement similarity index 96% rename from tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement rename to tutorials/multiphase/interFoam/RAS/floatingObject/0/pointDisplacement index 2b8d06c0fe..5a78970745 100644 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/0.orig/pointDisplacement +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/0/pointDisplacement @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class pointVectorField; + location "0"; object pointDisplacement; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +34,6 @@ boundaryField floatingObject { type calculated; - value uniform (0 0 0); } } diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean b/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean deleted file mode 100755 index 5734444f4e..0000000000 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allclean +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -rm -rf 0 > /dev/null 2>&1 - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun index 2625a4799c..325c9fdb50 100755 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/Allrun @@ -10,7 +10,6 @@ application=`getApplication` runApplication blockMesh runApplication topoSet runApplication subsetMesh -overwrite c0 -patch floatingObject -cp -r 0.orig 0 > /dev/null 2>&1 runApplication setFields runApplication $application diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U deleted file mode 100644 index 597fef7ff6..0000000000 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/U +++ /dev/null @@ -1,63 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - ".*" - { - type fixedValue; - value $internalField; - } - - gasInlet - { - type fixedValue; - value uniform (0 0 0.5); - } - - outlet - { - type pressureInletOutletVelocity; - value $internalField; - } - - "(shaftRotating|stirrer)" - { - type movingWallVelocity; - value $internalField; - } - - shaft - { - type rotatingWallVelocity; - origin (0 0 0); - axis (0 0 1); - omega -5; - } - - "AMI.*" - { - type cyclicAMI; - value $internalField; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh deleted file mode 100644 index f6bf576d4e..0000000000 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/p_rgh +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1.25e5; - -boundaryField -{ - ".*" - { - type fixedFluxPressure; - } - - outlet - { - type fixedValue; - value $internalField; - } - - "AMI.*" - { - type cyclicAMI; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/U b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/U new file mode 100644 index 0000000000..2895b00f68 Binary files /dev/null and b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/U differ diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/alpha.water.orig similarity index 66% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/alpha.water.orig index 17678343e2..523c1eb10f 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/alpha.water +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/alpha.water.orig @@ -8,9 +8,10 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; - object alpha.water; + location "0"; + object alpha.water.orig; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,28 +21,52 @@ internalField uniform 0; boundaryField { - ".*" + vessel { type zeroGradient; } - gasInlet { type fixedValue; value uniform 1; } - outlet { type inletOutlet; inletValue uniform 0; - value $internalField; + value uniform 0; } - - "AMI.*" + shaftRotating + { + type zeroGradient; + } + shaft + { + type zeroGradient; + } + sparger + { + type zeroGradient; + } + stirrer + { + type zeroGradient; + } + baffles + { + type zeroGradient; + } + AMI1 { type cyclicAMI; + value uniform 0; + } + AMI2 + { + type cyclicAMI; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/epsilon similarity index 54% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/epsilon index 8bfd1f4bec..cf7b74665f 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/epsilon +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/epsilon @@ -8,41 +8,69 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 2 -3 0 0 0 0]; -internalField uniform 7e-3; +internalField uniform 0.007; boundaryField { - ".*" + vessel { type epsilonWallFunction; - value $internalField; + value uniform 0.007; } - gasInlet { type fixedValue; - value $internalField; + value uniform 0.007; } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0.007; + value uniform 0.007; } - - "AMI.*" + shaftRotating + { + type epsilonWallFunction; + value uniform 0.007; + } + shaft + { + type epsilonWallFunction; + value uniform 0.007; + } + sparger + { + type epsilonWallFunction; + value uniform 0.007; + } + stirrer + { + type epsilonWallFunction; + value uniform 0.007; + } + baffles + { + type epsilonWallFunction; + value uniform 0.007; + } + AMI1 { type cyclicAMI; - value $internalField; + value uniform 0; + } + AMI2 + { + type cyclicAMI; + value uniform 0; } } diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/k similarity index 56% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/k index f421a4da3e..237bf98f4f 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/k +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/k @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,30 +21,58 @@ internalField uniform 0.01; boundaryField { - ".*" + vessel { type kqRWallFunction; - value $internalField; + value uniform 0.01; } - gasInlet { type fixedValue; - value $internalField; + value uniform 0.01; } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0.01; + value uniform 0.01; } - - "AMI.*" + shaftRotating + { + type kqRWallFunction; + value uniform 0.01; + } + shaft + { + type kqRWallFunction; + value uniform 0.01; + } + sparger + { + type kqRWallFunction; + value uniform 0.01; + } + stirrer + { + type kqRWallFunction; + value uniform 0.01; + } + baffles + { + type kqRWallFunction; + value uniform 0.01; + } + AMI1 { type cyclicAMI; - value $internalField; + value uniform 0; + } + AMI2 + { + type cyclicAMI; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/nut similarity index 56% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/nut index 1f482c86c6..503f3ca86d 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0.orig/nut +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/nut @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,29 +21,58 @@ internalField uniform 0; boundaryField { - ".*" + vessel { type nutkWallFunction; - value $internalField; + value uniform 0; } - gasInlet { type fixedValue; - value $internalField; + value uniform 0; } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0; + value uniform 0; } - - "AMI.*" + shaftRotating + { + type nutkWallFunction; + value uniform 0; + } + shaft + { + type nutkWallFunction; + value uniform 0; + } + sparger + { + type nutkWallFunction; + value uniform 0; + } + stirrer + { + type nutkWallFunction; + value uniform 0; + } + baffles + { + type nutkWallFunction; + value uniform 0; + } + AMI1 { type cyclicAMI; + value uniform 0; + } + AMI2 + { + type cyclicAMI; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/p_rgh b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/p_rgh new file mode 100644 index 0000000000..dda3e335be --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/0/p_rgh @@ -0,0 +1,84 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object p_rgh; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 125000; + +boundaryField +{ + vessel + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + gasInlet + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + outlet + { + type fixedValue; + value uniform 125000; + } + shaftRotating + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + shaft + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + sparger + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + stirrer + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + baffles + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + AMI1 + { + type cyclicAMI; + value uniform 0; + } + AMI2 + { + type cyclicAMI; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean index 83230a683e..6835fec6a6 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allclean @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1 diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre index e7e5a4ce56..8bf4810db9 100755 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/Allrun.pre @@ -7,8 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 - # Meshing runApplication blockMesh runApplication surfaceFeatureExtract @@ -16,9 +14,6 @@ runApplication snappyHexMesh -overwrite runApplication createBaffles -overwrite runApplication mergeOrSplitBaffles -split -overwrite -# Copy fields after meshing to avoind the generation of unnecessary patch fields -cp -r 0.orig 0 - # Initialize alpha runApplication setFields diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/U similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/U rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/U diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water.orig b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/alpha.water.orig rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/alpha.water.orig diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/epsilon similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/epsilon rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/epsilon diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/include/initialConditions similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/include/initialConditions rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/include/initialConditions diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/k similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/k rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/k diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/nut similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/nut rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/nut diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh similarity index 100% rename from tutorials/multiphase/interFoam/RAS/weirOverflow/0.orig/p_rgh rename to tutorials/multiphase/interFoam/RAS/weirOverflow/0/p_rgh diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean deleted file mode 100755 index 2c5a008802..0000000000 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allclean +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -rm -rf 0 > /dev/null 2>&1 - -cleanCase diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun index c7b2c226e9..68f2b4db1e 100755 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/Allrun @@ -3,8 +3,8 @@ # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -cp -r 0.orig 0 > /dev/null 2>&1 - runApplication blockMesh runApplication setFields runApplication `getApplication` + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/U.orig similarity index 91% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/U.orig index e2088b5e51..49175112f6 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/U +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/U.orig @@ -11,7 +11,7 @@ FoamFile format ascii; class volVectorField; location "0"; - object U; + object U.orig; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -29,7 +29,8 @@ boundaryField walls { type uniformFixedValue; - uniformValue (0 0 0); + uniformValue constant (0 0 0); + value uniform (0 0 0); } } diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water.orig b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/alpha.water.orig similarity index 92% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water.orig rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/alpha.water.orig index e0eda6f9eb..cad61387b3 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/alpha.water.orig +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/alpha.water.orig @@ -10,7 +10,8 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alpha.water; + location "0"; + object alpha.water.orig; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,22 +21,17 @@ internalField uniform 0; boundaryField { - walls - { - type zeroGradient; - } - - obstacle - { - type zeroGradient; - } - atmosphere { type inletOutlet; inletValue uniform 0; value uniform 0; } + walls + { + type zeroGradient; + } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/k similarity index 89% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/k index 375776f540..7022f1d99c 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/k +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/k @@ -24,15 +24,15 @@ boundaryField atmosphere { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0.00015; + value uniform 0.00015; } - walls { type kqRWallFunction; - value $internalField; + value uniform 0.00015; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/nut similarity index 93% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/nut index 2cb94295f9..dc67b6a30a 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/nut +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/nut @@ -25,13 +25,12 @@ boundaryField { type zeroGradient; } - walls { type nutkRoughWallFunction; - Ks uniform 100e-6; + Ks uniform 0.0001; Cs uniform 0.5; - value $internalField; + value uniform 5e-07; } } diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/omega similarity index 89% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/omega index ea3112f3d0..a7bd18b63a 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/omega +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/omega @@ -24,17 +24,15 @@ boundaryField atmosphere { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 2; + value uniform 2; } - walls { type omegaWallFunction; - value $internalField; + value uniform 2; } } - // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh similarity index 89% rename from tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh rename to tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh index 297c28eb09..5425b45422 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0.orig/p_rgh +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/0/p_rgh @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p_rgh; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,25 +21,22 @@ internalField uniform 0; boundaryField { - walls - { - type fixedFluxPressure; - phi phiAbs; - value uniform 0; - } - - obstacle - { - type fixedFluxPressure; - phi phiAbs; - value uniform 0; - } - atmosphere { type totalPressure; + rho rho; + psi none; + gamma 1; p0 uniform 0; + value uniform 0; + } + walls + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 0; } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean index d1295e344e..8a15df0ff4 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allclean @@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions rm system/cellSetDict > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 cleanCase diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun index d7c395612e..b4eca821f6 100755 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/Allrun @@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -cp -r 0.orig 0 > /dev/null 2>&1 runApplication blockMesh -#runApplication setSet -batch createObstacle.setSet runApplication topoSet runApplication subsetMesh -overwrite c0 -patch walls runApplication setFields diff --git a/tutorials/multiphase/interFoam/laminar/wave/0.orig/U b/tutorials/multiphase/interFoam/laminar/wave/0/U.orig similarity index 100% rename from tutorials/multiphase/interFoam/laminar/wave/0.orig/U rename to tutorials/multiphase/interFoam/laminar/wave/0/U.orig diff --git a/tutorials/multiphase/interFoam/laminar/wave/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/wave/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/interFoam/laminar/wave/0.orig/alpha.water rename to tutorials/multiphase/interFoam/laminar/wave/0/alpha.water.orig diff --git a/tutorials/multiphase/interFoam/laminar/wave/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/wave/0/p_rgh similarity index 100% rename from tutorials/multiphase/interFoam/laminar/wave/0.orig/p_rgh rename to tutorials/multiphase/interFoam/laminar/wave/0/p_rgh diff --git a/tutorials/multiphase/interFoam/laminar/wave/0/polyMesh/cellMap b/tutorials/multiphase/interFoam/laminar/wave/0/polyMesh/cellMap new file mode 100644 index 0000000000..e116be5f09 Binary files /dev/null and b/tutorials/multiphase/interFoam/laminar/wave/0/polyMesh/cellMap differ diff --git a/tutorials/multiphase/interFoam/laminar/wave/Allclean b/tutorials/multiphase/interFoam/laminar/wave/Allclean deleted file mode 100755 index 7dde89aeca..0000000000 --- a/tutorials/multiphase/interFoam/laminar/wave/Allclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -cd ${0%/*} || exit 1 - -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase && rm -rf 0 diff --git a/tutorials/multiphase/interFoam/laminar/wave/Allrun b/tutorials/multiphase/interFoam/laminar/wave/Allrun index 99393456ad..ab78d78437 100755 --- a/tutorials/multiphase/interFoam/laminar/wave/Allrun +++ b/tutorials/multiphase/interFoam/laminar/wave/Allrun @@ -6,8 +6,6 @@ cd ${0%/*} || exit 1 runApplication blockMesh -cp -r 0.orig 0 - runApplication extrudeMesh for i in 1 2 diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/U similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/U rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/U diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/alpha.water similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/alpha.water rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/alpha.water diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/epsilon similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/epsilon rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/epsilon diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/k similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/k rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/k diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/nut similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/nut rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/nut diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/p_rgh similarity index 100% rename from tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh rename to tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0/p_rgh diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean index 496837c14e..064e187345 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allclean @@ -9,6 +9,7 @@ rm -f constant/triSurface/propellerTip.obj.gz > /dev/null 2>&1 cleanCase -rm -rf 0 > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -f constant/triSurface/*.eMesh* > /dev/null 2>&1 + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun index 1d24256eb0..4b68478f87 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun @@ -11,3 +11,5 @@ runApplication decomposePar runParallel `getApplication` runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre index 0f299581cb..303538e95f 100755 --- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre +++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre @@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# copy propeller surface from resources directory +# Copy propeller surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/ - -# - meshing - runApplication blockMesh runApplication surfaceFeatureExtract @@ -18,25 +15,13 @@ runApplication snappyHexMesh -overwrite runApplication renumberMesh -overwrite -# force removal of fields generated by snappy -rm -rf 0 - - -# - generate face/cell sets and zones - -#runApplication setSet -batch createInletOutletSets.setSet +# Generate face/cell sets and zones runApplication topoSet -dict system/createInletOutletSets.topoSetDict - -# - create the inlet/outlet and AMI patches - +# Create the inlet/outlet and AMI patches runApplication createPatch -overwrite - -# - test by running moveDynamicMesh +# Test by running moveDynamicMesh #runApplication moveDynamicMesh -checkAMI - -# - apply the initial fields - -cp -rf 0.orig 0 +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/Phi similarity index 100% rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/Phi rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/Phi diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/U.orig similarity index 100% rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/U.orig diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water similarity index 100% rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/alpha.water rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/alpha.water diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh.orig similarity index 100% rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/p_rgh rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0/p_rgh.orig diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean index dff0a164b0..be82993080 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean @@ -7,8 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Remove surface rm -f constant/triSurface/bullet.stl.gz -# Remove copy of 0.orig -rm -rf 0 +rm -f 0/phi cleanCase diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun index d51646f4c6..2e0c4282c4 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun @@ -13,8 +13,6 @@ runApplication blockMesh # Generate the snappy mesh runApplication snappyHexMesh -overwrite -cp -r 0.orig 0 - # Initialise with potentialFoam solution runApplication potentialFoam -pName p_rgh diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alphas b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alphas deleted file mode 100644 index 10e3ea7a07..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alphas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type zeroGradient; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.air similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.air rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.air diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.mercury similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.mercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.mercury diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.oil similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.oil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.oil diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.water similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/U.water rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/U.water diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.air rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.air.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.mercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.mercury.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.oil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.oil.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/alpha.water rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/alpha.water.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/p_rgh similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.orig/p_rgh rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0/p_rgh diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean index 9f691c9385..0f10a7e76d 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 +rm -f 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun index e909a02e90..16823adae6 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication $application diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict index b277afb1c5..39b2cf58b3 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict @@ -21,7 +21,6 @@ defaultFieldValues volScalarFieldValue alpha.water 0 volScalarFieldValue alpha.oil 0 volScalarFieldValue alpha.mercury 0 - volVectorFieldValue U (0 0 0) ); regions diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alphas b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alphas deleted file mode 100644 index 10e3ea7a07..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alphas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type zeroGradient; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U similarity index 98% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U index 7e018e522b..896020332d 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format ascii; + format binary; class volVectorField; location "0"; object U; diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.air similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.air rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.air diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.mercury similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.mercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.mercury diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.oil similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.oil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.oil diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.water similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/U.water rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/U.water diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.air rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.air.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.mercury rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.mercury.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.oil rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.oil.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/alpha.water rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/alpha.water.orig diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/p_rgh similarity index 100% rename from tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh rename to tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0/p_rgh diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean index 9f691c9385..0f10a7e76d 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 +rm -f 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun index 98bbc1abe7..20df438f87 100755 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication decomposePar diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas deleted file mode 100644 index 10e3ea7a07..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alphas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type zeroGradient; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/U diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.air.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.mercury.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.oil.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alpha.water.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p_rgh diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean index 9f691c9385..0f10a7e76d 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 +rm -f 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun index e909a02e90..16823adae6 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication $application diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas deleted file mode 100644 index 10e3ea7a07..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - leftWall - { - type zeroGradient; - } - rightWall - { - type zeroGradient; - } - lowerWall - { - type zeroGradient; - } - atmosphere - { - type zeroGradient; - } - defaultFaces - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/U diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.air.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.mercury.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.oil.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alpha.water.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p_rgh diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean index 9f691c9385..0f10a7e76d 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allclean @@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 +rm -f 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun index c6e41026cd..20df438f87 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun @@ -7,8 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication decomposePar diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U deleted file mode 100644 index 27d718d526..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - rotor - { - type fixedValue; - value uniform (0 0 0); - } - - stator - { - type noSlip; - } - - front - { - type empty; - } - - back - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh deleted file mode 100644 index dd48a876bc..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/p_rgh +++ /dev/null @@ -1,44 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - rotor - { - type zeroGradient; - } - - stator - { - type zeroGradient; - } - - front - { - type empty; - } - - back - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air deleted file mode 100644 index a53034d33d..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air +++ /dev/null @@ -1,3119 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alpha.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField nonuniform List -3072 -( -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -) -; - -boundaryField -{ - rotor - { - type zeroGradient; - } - stator - { - type zeroGradient; - } - front - { - type empty; - } - back - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.air rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.air.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury deleted file mode 100644 index 76002901ed..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury +++ /dev/null @@ -1,3119 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alpha.mercury; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField nonuniform List -3072 -( -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -) -; - -boundaryField -{ - rotor - { - type zeroGradient; - } - stator - { - type zeroGradient; - } - front - { - type empty; - } - back - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.mercury rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.mercury.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil deleted file mode 100644 index 56d642d0d9..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil +++ /dev/null @@ -1,3119 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alpha.oil; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField nonuniform List -3072 -( -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -) -; - -boundaryField -{ - rotor - { - type zeroGradient; - } - stator - { - type zeroGradient; - } - front - { - type empty; - } - back - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.oil rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.oil.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water deleted file mode 100644 index 766d8c1462..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water +++ /dev/null @@ -1,3119 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alpha.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField nonuniform List -3072 -( -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -) -; - -boundaryField -{ - rotor - { - type zeroGradient; - } - stator - { - type zeroGradient; - } - front - { - type empty; - } - back - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water.orig similarity index 100% rename from tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/alpha.water rename to tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0/alpha.water.orig diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean index e62451c67f..f0100db1c8 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allclean @@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase -rm 0/alphas > /dev/null 2>&1 +rm -f 0/alphas #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun index 66c1631fd3..f515c9d012 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun @@ -7,6 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory application=`getApplication` runApplication ./makeMesh +runApplication setFields runApplication $application #------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/U similarity index 72% rename from tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U rename to tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/U index 9994b73763..013c261cdf 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/U +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/U @@ -26,48 +26,40 @@ boundaryField type pressureInletOutletParSlipVelocity; value uniform (0 0 0); } - walls { type noSlip; } - floatingObject { type fixedNormalInletOutletVelocity; - fixTangentialInflow false; - normalVelocity { type uniformFixedValue; - - uniformValue + uniformValue scale; + uniformValueCoeffs { - type scale; - - value + scale linearRamp; + scaleCoeffs { - type sine; - - frequency 1; - amplitude 0.025; - scale (0 1 0); - level (0 0 0); + start 0; + duration 10; } - - scale + value sine; + valueCoeffs { - type linearRamp; - - duration 10; + t0 0; + amplitude constant 0.025; + frequency constant 1; + scale constant (0 1 0); + level constant (0 0 0); } } + value uniform (0 0 0); } - value uniform (0 0 0); } - frontAndBack { type empty; diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/p similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p rename to tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/p diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/p_gh similarity index 97% rename from tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh rename to tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/p_gh index 944805dcca..f362514ec3 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0.orig/p_gh +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/0/p_gh @@ -33,6 +33,7 @@ boundaryField floatingObject { type fixedFluxPressure; + gradient uniform 0; value uniform 0; } frontAndBack diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean deleted file mode 100755 index a0dbe45d86..0000000000 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allclean +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase - -rm -rf 0 -rm -rf poolHeight poolHeight_vs_time diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun index 1e2a0971ce..9ad4a33253 100755 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun @@ -10,7 +10,6 @@ application=`getApplication` runApplication blockMesh runApplication topoSet runApplication subsetMesh -overwrite c0 -patch floatingObject -cp -r 0.orig 0 > /dev/null 2>&1 runApplication $application diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/U similarity index 100% rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/U rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/U diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/alpha.sludge.orig similarity index 100% rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/alpha.sludge rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/alpha.sludge.orig diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/p_rgh similarity index 100% rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0.orig/p_rgh rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/0/p_rgh diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean deleted file mode 100755 index 9f691c9385..0000000000 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allclean +++ /dev/null @@ -1,11 +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 - -#------------------------------------------------------------------------------ diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun index e909a02e90..16823adae6 100755 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -rf 0 -cp -r 0.orig 0 - runApplication blockMesh runApplication setFields runApplication $application diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict index 12f879946c..df22143d0a 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/system/setFieldsDict @@ -17,7 +17,6 @@ FoamFile defaultFieldValues ( volScalarFieldValue alpha.sludge 0 - volVectorFieldValue U (0 0 0) ); regions