diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CH4.orig similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CH4 rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CH4.orig diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CO similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CO diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CO2 similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/CO2 rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/CO2 diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/G similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/G rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/G diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H2 similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2 rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H2 diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H2O similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/H2O rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/H2O diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/N2.orig similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/N2 rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/N2.orig diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/O similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/O diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2 b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/O2.orig similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/O2 rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/O2.orig diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/OH similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/OH rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/OH diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/T.orig similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/T rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/T.orig diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/U similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/U rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/U diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/Ydefault similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/Ydefault rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/Ydefault diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/alphat similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/alphat rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/alphat diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/epsilon similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/epsilon rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/epsilon diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/k similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/k rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/k diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/nut similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/nut rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/nut diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/p similarity index 100% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0.orig/p rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/0/p diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean deleted file mode 100755 index 9f691c938..000000000 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/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/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun index ae405888c..da6a73312 100755 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun @@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory # Set application name application=`getApplication` -rm -f 0 -cp -r 0.orig 0 - runApplication chemkinToFoam \ chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties \ constant/reactionsGRI constant/thermo.compressibleGasGRI diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties index 69af36f9b..f8c1f4c3d 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/chemistryProperties @@ -20,7 +20,7 @@ chemistryType method TDAC; } -chemistry on; +chemistry off; importantSpecies { diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict index 66951131a..bf9887f7b 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict @@ -7,13 +7,12 @@ \*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; + version 2; format ascii; class dictionary; location "system"; object controlDict; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // application reactingFoam; @@ -23,13 +22,13 @@ startTime 0; stopAt endTime; -endTime 6000; +endTime 1500; deltaT 1; writeControl runTime; -writeInterval 100; +writeInterval 1500; purgeWrite 0; diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0.orig/T rename to tutorials/compressible/rhoCentralFoam/shockTube/0/T.orig diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0.orig/U rename to tutorials/compressible/rhoCentralFoam/shockTube/0/U.orig diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0.orig/p rename to tutorials/compressible/rhoCentralFoam/shockTube/0/p.orig diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean deleted file mode 100755 index 489a286e3..000000000 --- a/tutorials/compressible/rhoCentralFoam/shockTube/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 - -rm -rf 0 -cp -r 0.orig 0 -cleanCase -cleanSamples - -#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict index cd21562c8..69cfbb00e 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict +++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/setFieldsDict @@ -15,9 +15,25 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volVectorFieldValue U (0 0 0) volScalarFieldValue T 348.432 volScalarFieldValue p 100000 ); +defaultFieldValues +( + volVectorFieldValue U (0 0 0) + volScalarFieldValue T 348.432 + volScalarFieldValue p 100000 +); -regions ( boxToCell { box (0 -1 -1) (5 1 1) ; fieldValues ( volScalarFieldValue T 278.746 volScalarFieldValue p 10000 ) ; } ); +regions +( + boxToCell + { + box (0 -1 -1) (5 1 1); + fieldValues + ( + volScalarFieldValue T 278.746 + volScalarFieldValue p 10000 + ); + } +); // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T deleted file mode 100644 index dbc34e6cb..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/T +++ /dev/null @@ -1,34 +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 T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U deleted file mode 100644 index 7da5ec784..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/U +++ /dev/null @@ -1,34 +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; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p deleted file mode 100644 index d826cfa47..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0.orig/p +++ /dev/null @@ -1,34 +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; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T deleted file mode 100644 index dbc34e6cb..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T +++ /dev/null @@ -1,34 +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 T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0/T rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/T.orig diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U deleted file mode 100644 index 7da5ec784..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U +++ /dev/null @@ -1,34 +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; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0/U rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/U.orig diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p deleted file mode 100644 index d826cfa47..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p +++ /dev/null @@ -1,34 +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; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p.orig similarity index 100% rename from tutorials/compressible/rhoCentralFoam/shockTube/0/p rename to tutorials/compressible/sonicFoam/laminar/shockTube/0/p.orig diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean deleted file mode 100755 index 2c848c80e..000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/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 -cp -r 0.orig 0 -cleanSamples - -#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/propeller/0/U similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0/U diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/RAS/propeller/0/epsilon similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/epsilon rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0/epsilon diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/propeller/0/k similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0/k diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/propeller/0/nut similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0/nut diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/propeller/0/p similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/propeller/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/propeller/0/p diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean index 496837c14..80cd9ee6e 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allclean @@ -4,11 +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/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/incompressible/pimpleFoam/RAS/propeller/Allrun b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun index 1d24256eb..4b68478f8 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun @@ -11,3 +11,5 @@ runApplication decomposePar runParallel `getApplication` runApplication reconstructPar + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre index 41142ea37..d583cd7e9 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/Allrun.pre @@ -30,5 +30,4 @@ runApplication createPatch -overwrite # - test by running moveDynamicMes #runApplication moveDynamicMesh -checkAMI -# - set the initial fields -cp -rf 0.orig 0 +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean index a2762cd0d..b0f6ea4c7 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allclean @@ -9,8 +9,9 @@ cleanCase cd ../wingMotion2D_simpleFoam cleanCase -rm -rf 0 cd ../wingMotion2D_pimpleFoam cleanCase -rm -rf 0 +rm -f 0/p 0/nut 0/k 0/omega 0/U 0/pointDisplacement + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun index 07bc36cc7..21744f240 100755 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/Allrun @@ -13,16 +13,14 @@ runApplication snappyHexMesh -overwrite cd ../wingMotion2D_simpleFoam runApplication extrudeMesh runApplication createPatch -overwrite -cp -r 0.orig 0 runApplication simpleFoam # Copy the mesh from the steady state case and map the results to a # mesh motion case, then solve transient. cd ../wingMotion2D_pimpleFoam cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant -cp -r 0.orig 0 runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent -mv 0/pointDisplacement.unmapped 0/pointDisplacement +cp pointDisplacement 0/pointDisplacement runApplication decomposePar runParallel `getApplication` runApplication reconstructPar diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U deleted file mode 100644 index 12f437853..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/U +++ /dev/null @@ -1,45 +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; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/initialConditions" - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform $flowVelocity; - -boundaryField -{ - #include "include/fixedInlet" - - outlet - { - type inletOutlet; - inletValue uniform (0 0 0); - value $internalField; - } - - wing - { - type movingWallVelocity; - value uniform (0 0 0); - } - - #include "include/frontBackTopBottomPatches" -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/fixedInlet rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/fixedInlet diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/include/initialConditions rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0/include/initialConditions diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/pointDisplacement similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/pointDisplacement rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/pointDisplacement diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k deleted file mode 100644 index 0203605b0..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/k +++ /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 k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/initialConditions" - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform $turbulentKE; - -boundaryField -{ - #include "include/fixedInlet" - - outlet - { - type inletOutlet; - inletValue $internalField; - value $internalField; - } - - wing - { - type kqRWallFunction; - value $internalField; - } - - #include "include/frontBackTopBottomPatches" -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut deleted file mode 100644 index 5c44f0d9c..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/nut +++ /dev/null @@ -1,38 +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 nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - wing - { - type nutkWallFunction; - value uniform 0; - } - - "(front|back|topAndBottom|inlet|outlet)" - { - type calculated; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega deleted file mode 100644 index 52373c885..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/omega +++ /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 epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/initialConditions" - -dimensions [0 0 -1 0 0 0 0]; - -internalField uniform $turbulentOmega; - -boundaryField -{ - #include "include/fixedInlet" - - outlet - { - type inletOutlet; - inletValue $internalField; - value $internalField; - } - - wing - { - type omegaWallFunction; - value $internalField; - } - - #include "include/frontBackTopBottomPatches" -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p deleted file mode 100644 index 6ed3e5817..000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/p +++ /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; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "include/initialConditions" - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform $pressure; - -boundaryField -{ - inlet - { - type zeroGradient; - } - - outlet - { - type fixedValue; - value $internalField; - } - - wing - { - type zeroGradient; - } - - #include "include/frontBackTopBottomPatches" -} - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/U similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/U rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/U diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/fixedInlet rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/fixedInlet diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/frontBackTopBottomPatches similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/frontBackTopBottomPatches rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/frontBackTopBottomPatches diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0.orig/include/initialConditions rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/include/initialConditions diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/k similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/k rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/k diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/nut similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/nut rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/nut diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/omega similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/omega rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/omega diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/p similarity index 100% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/0.orig/p rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/0/p diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/U similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/U rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/U diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/fixedInlet rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/fixedInlet diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/frontBackUpperPatches similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/frontBackUpperPatches rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/frontBackUpperPatches diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/include/initialConditions rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/include/initialConditions diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/k similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/k rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/k diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/nuTilda similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nuTilda rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/nuTilda diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/nut similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/nut rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/nut diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/p similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0.orig/p rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/0/p diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean index 32ab17201..9eed1676c 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allclean @@ -4,11 +4,9 @@ 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/motorBike.obj.gz -rm -rf 0 > /dev/null 2>&1 - cleanCase # Reset decomposeParDict diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun index 7952d5c10..5fd7b8f0a 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/Allrun @@ -7,21 +7,15 @@ cd ${0%/*} || exit 1 # Run from this directory # copy motorbike surface from resources directory cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/ -# Make dummy 0 directory -mkdir 0 - runApplication blockMesh cp system/decomposeParDict.hierarchical system/decomposeParDict -runApplication decomposePar +runApplication decomposePar -copyZero cp system/decomposeParDict.ptscotch system/decomposeParDict runParallel snappyHexMesh -overwrite find . -type f -iname "*level*" -exec rm {} \; -ls -d processor* | xargs -I {} rm -rf ./{}/0 -ls -d processor* | xargs -I {} cp -r 0.orig ./{}/0 - runParallel renumberMesh -overwrite runParallel potentialFoam -initialiseUBCs diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U b/tutorials/incompressible/simpleFoam/turbineSiting/0/U similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/U rename to tutorials/incompressible/simpleFoam/turbineSiting/0/U diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon b/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/epsilon rename to tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/ABLConditions rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/fixedInlet rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/fixedInlet diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/initialConditions rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/initialConditions diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/sideAndTopPatches similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/include/sideAndTopPatches rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/sideAndTopPatches diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k b/tutorials/incompressible/simpleFoam/turbineSiting/0/k similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/k rename to tutorials/incompressible/simpleFoam/turbineSiting/0/k diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut b/tutorials/incompressible/simpleFoam/turbineSiting/0/nut similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/nut rename to tutorials/incompressible/simpleFoam/turbineSiting/0/nut diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p b/tutorials/incompressible/simpleFoam/turbineSiting/0/p similarity index 100% rename from tutorials/incompressible/simpleFoam/turbineSiting/0.orig/p rename to tutorials/incompressible/simpleFoam/turbineSiting/0/p diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean index aae8b75f8..78e29a4dc 100755 --- a/tutorials/incompressible/simpleFoam/turbineSiting/Allclean +++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean @@ -4,8 +4,6 @@ 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 # Remove decomposeParDict diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun index 41c70c86e..016da2e81 100755 --- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun +++ b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun @@ -4,20 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Make dummy 0 directory -mkdir 0 - runApplication blockMesh cp system/decomposeParDict.hierarchical system/decomposeParDict -runApplication decomposePar +runApplication decomposePar -copyZero cp system/decomposeParDict.ptscotch system/decomposeParDict runParallel snappyHexMesh -overwrite find . -type f -iname "*level*" -exec rm {} \; -ls -d processor* | xargs -I {} cp -r 0.orig ./{}/0 - runParallel topoSet runParallel `getApplication` diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/H2O rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/H2O diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/N2 rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/N2 diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/O2 rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/O2 diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/T rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/T diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/U similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/U rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/U diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/p diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/Tf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Tf rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/Tf diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/Uf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/Uf rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/Uf diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/deltaf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/cylinder/0.orig/wallFilmRegion/deltaf rename to tutorials/lagrangian/reactingParcelFoam/cylinder/0/wallFilmRegion/deltaf diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean index 772564343..6410dc90e 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allclean @@ -7,7 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase rm -rf constant/wallFilmRegion -rm -rf 0 rm -f *.obj #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun index 3e58a9551..bbd0edee6 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun @@ -8,3 +8,5 @@ cd ${0%/*} || exit 1 # Run from this directory application=`getApplication` runApplication $application + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre index a095ff7bf..8df6b2cd6 100755 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/Allrun.pre @@ -1,7 +1,6 @@ #!/bin/sh . $WM_PROJECT_DIR/bin/tools/RunFunctions -cp -rf 0.orig 0 runApplication blockMesh #runApplication setSet -batch wallFilmRegion.setSet @@ -11,3 +10,5 @@ runApplication extrudeToRegionMesh -overwrite paraFoam -touch paraFoam -touch -region wallFilmRegion + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/H2O rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/H2O diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/N2 rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/N2 diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/O2 rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/O2 diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/T rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/T diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/U similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/U rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/U diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/p diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/Tf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Tf rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/Tf diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/Uf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/Uf rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/Uf diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/deltaf similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0.orig/wallFilmRegion/deltaf rename to tutorials/lagrangian/reactingParcelFoam/rivuletPanel/0/wallFilmRegion/deltaf diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean index 772564343..6410dc90e 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allclean @@ -7,7 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase rm -rf constant/wallFilmRegion -rm -rf 0 rm -f *.obj #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun index 3e58a9551..bbd0edee6 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun @@ -8,3 +8,5 @@ cd ${0%/*} || exit 1 # Run from this directory application=`getApplication` runApplication $application + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre index 33fa3f820..1b494b5aa 100755 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/Allrun.pre @@ -1,8 +1,6 @@ #!/bin/sh . $WM_PROJECT_DIR/bin/tools/RunFunctions -cp -rf 0.orig 0 - runApplication blockMesh #runApplication setSet -batch wallFilmRegion.setSet @@ -12,3 +10,5 @@ runApplication extrudeToRegionMesh -overwrite paraFoam -touch paraFoam -touch -region wallFilmRegion + +#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/H2O rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/T rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U.orig similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/U rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U.orig diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/air rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/alphat rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/k rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/nut rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/nut diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/omega rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.orig/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean deleted file mode 100755 index df77730bc..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/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 - -# remove old time and post-processing directories -rm -rf 0 *[1-9]* processor* postProcessing - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun index c4db5f47c..0eba55752 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun @@ -4,17 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# create mesh +# Create mesh runApplication blockMesh -cp -r 0.orig 0 - -# initialise with potentialFoam solution +# Initialise with potentialFoam solution runApplication potentialFoam rm -f 0/phi -# run the solver +# Run the solver runApplication `getApplication` #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/H2O rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/H2O diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/T rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/T diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U.orig similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/U rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/U.orig diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/air rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/air diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/alphat rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/alphat diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/k rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/k diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/nut rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/nut diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/omega rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/omega diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p_rgh similarity index 100% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0.orig/p_rgh rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/0/p_rgh diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allclean deleted file mode 100755 index df77730bc..000000000 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/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 - -# remove old time and post-processing directories -rm -rf 0 *[1-9]* processor* postProcessing - -cleanCase - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun index c4db5f47c..0eba55752 100755 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun @@ -4,17 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# create mesh +# Create mesh runApplication blockMesh -cp -r 0.orig 0 - -# initialise with potentialFoam solution +# Initialise with potentialFoam solution runApplication potentialFoam rm -f 0/phi -# run the solver +# Run the solver runApplication `getApplication` #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U deleted file mode 100644 index 597fef7ff..000000000 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/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/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh deleted file mode 100644 index 6742c6523..000000000 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/p_rgh +++ /dev/null @@ -1,43 +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; - phi phiAbs; - value $internalField; - } - - outlet - { - type fixedValue; - value $internalField; - } - - "AMI.*" - { - type cyclicAMI; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0/U b/tutorials/mesh/foamyHexMesh/mixerVessel/0/U new file mode 100644 index 000000000..b79b66009 Binary files /dev/null and b/tutorials/mesh/foamyHexMesh/mixerVessel/0/U differ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1 b/tutorials/mesh/foamyHexMesh/mixerVessel/0/alpha.phase1.orig similarity index 100% rename from tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/alpha.phase1 rename to tutorials/mesh/foamyHexMesh/mixerVessel/0/alpha.phase1.orig diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon b/tutorials/mesh/foamyHexMesh/mixerVessel/0/epsilon similarity index 100% rename from tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/epsilon rename to tutorials/mesh/foamyHexMesh/mixerVessel/0/epsilon diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k b/tutorials/mesh/foamyHexMesh/mixerVessel/0/k similarity index 50% rename from tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k rename to tutorials/mesh/foamyHexMesh/mixerVessel/0/k index f421a4da3..27fe1d280 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/k +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0/k @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,30 +21,68 @@ internalField uniform 0.01; boundaryField { - ".*" - { - type kqRWallFunction; - value $internalField; - } - - gasInlet - { - type fixedValue; - value $internalField; - } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0.01; + value uniform 0.01; } - - "AMI.*" + vessel + { + type kqRWallFunction; + value uniform 0.01; + } + gasInlet + { + type fixedValue; + value uniform 0.01; + } + sparger + { + type kqRWallFunction; + value uniform 0.01; + } + spargerShaft + { + type kqRWallFunction; + value uniform 0.01; + } + shaftRotating + { + type kqRWallFunction; + value uniform 0.01; + } + shaft + { + type kqRWallFunction; + value uniform 0.01; + } + stirrer_baffles + { + 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/mesh/foamyHexMesh/mixerVessel/0.orig/nut b/tutorials/mesh/foamyHexMesh/mixerVessel/0/nut similarity index 51% rename from tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut rename to tutorials/mesh/foamyHexMesh/mixerVessel/0/nut index 1f482c86c..039e1bc99 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/nut +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0/nut @@ -8,8 +8,9 @@ FoamFile { version 2.0; - format ascii; + format binary; class volScalarField; + location "0"; object nut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,29 +21,68 @@ internalField uniform 0; boundaryField { - ".*" - { - type nutkWallFunction; - value $internalField; - } - - gasInlet - { - type fixedValue; - value $internalField; - } - outlet { type inletOutlet; - inletValue $internalField; - value $internalField; + inletValue uniform 0; + value uniform 0; } - - "AMI.*" + vessel + { + type nutkWallFunction; + value uniform 0; + } + gasInlet + { + type fixedValue; + value uniform 0; + } + sparger + { + type nutkWallFunction; + value uniform 0; + } + spargerShaft + { + type nutkWallFunction; + value uniform 0; + } + shaftRotating + { + type nutkWallFunction; + value uniform 0; + } + shaft + { + type nutkWallFunction; + value uniform 0; + } + stirrer_baffles + { + 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/mesh/foamyHexMesh/mixerVessel/0/p_rgh b/tutorials/mesh/foamyHexMesh/mixerVessel/0/p_rgh new file mode 100644 index 000000000..9c7a78749 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0/p_rgh @@ -0,0 +1,64 @@ +/*--------------------------------*- 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 +{ + outlet + { + type fixedValue; + value uniform 125000; + } + vessel + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + gasInlet + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + sparger + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + spargerShaft + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + shaftRotating + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } + shaft + { + type fixedFluxPressure; + gradient uniform 0; + value uniform 125000; + } diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean index d7ffd378f..b872b72db 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allclean @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory cleanCase -rm -rf 0 rm -rf constant/extendedFeatureEdgeMesh/ rm -f constant/triSurface/*.eMesh* rm -f constant/triSurface/*.stl @@ -20,5 +19,4 @@ rm -f constant/backgroundMeshDecomposition/polyMesh/neighbour rm -f constant/backgroundMeshDecomposition/polyMesh/owner rm -f constant/backgroundMeshDecomposition/polyMesh/points - #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre index 9260273af..ffa94c391 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-pre @@ -19,13 +19,9 @@ intersectSurfaces() # Set application name application=$(getApplication) -rm -rf 0 - - # Run the surface preparation script ./constant/triSurface/surfaceProcess.sh > log.surfaceProcess 2>&1 - # Surface intersections intersectSurfaces \ constant/triSurface/vessel.stl \ @@ -69,7 +65,6 @@ do -surf2Baffle done - # Meshing cp system/controlDict.mesh system/controlDict diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation index 45d0f11ee..967f8096f 100755 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation @@ -9,17 +9,12 @@ cp system/controlDict.flow system/controlDict # Set application name application=$(getApplication) -rm -rf 0 - runApplication createBaffles -overwrite runApplication mergeOrSplitBaffles -split -overwrite # Get rid of zero faced patches runApplication createPatch -overwrite -# Copy fields after meshing to avoind the generation of unnecessary patch fields -cp -r 0.orig 0 - # Initialize alpha runApplication setFields @@ -33,5 +28,4 @@ runParallel $application # Reconstruct runApplication reconstructPar -noFunctionObjects - #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_sparger.vtk b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_sparger.vtk new file mode 100644 index 000000000..902727fd8 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_sparger.vtk @@ -0,0 +1,1621 @@ +# vtk DataFile Version 2.0 +sampleSurface +ASCII +DATASET POLYDATA +POINTS 541 double +0.0187938 -0.0068404 -0.01 +0.0068404 -0.0187938 -0.01 +-0.0068404 -0.0187938 -0.01 +-0.0187938 -0.0068404 -0.01 +-0.0187938 0.0068404 -0.01 +-0.0068404 0.0187938 -0.01 +0.0068404 0.0187938 -0.01 +0.0187938 0.0068404 -0.01 +0.0173205 -0.01 -0.01 +0.01 -0.0173205 -0.01 +-0.01 -0.0173205 -0.01 +-0.0173205 -0.01 -0.01 +-0.0173205 0.01 -0.01 +-0.01 0.0173205 -0.01 +0.01 0.0173205 -0.01 +0.0173205 0.01 -0.01 +0.02 4.89859e-18 -0.01 +1.22465e-18 -0.02 -0.01 +-0.02 -2.44929e-18 -0.01 +-3.67394e-18 0.02 -0.01 +0.0153209 -0.0128558 -0.01 +0.0128558 -0.0153209 -0.01 +-0.0128558 -0.0153209 -0.01 +-0.0153209 -0.0128558 -0.01 +-0.0153209 0.0128558 -0.01 +-0.0128558 0.0153209 -0.01 +0.0128558 0.0153209 -0.01 +0.0153209 0.0128558 -0.01 +0.0196962 -0.00347296 -0.01 +0.00347296 -0.0196962 -0.01 +-0.00347296 -0.0196962 -0.01 +-0.0196962 -0.00347296 -0.01 +-0.0196962 0.00347296 -0.01 +-0.00347296 0.0196962 -0.01 +0.00347296 0.0196962 -0.01 +0.0196962 0.00347296 -0.01 +0 0 -0.03 +0.0187938 -0.0068404 -0.029 +0.0068404 -0.0187938 -0.029 +-0.0068404 -0.0187938 -0.029 +-0.0187938 -0.0068404 -0.029 +-0.0187938 0.0068404 -0.029 +-0.0068404 0.0187938 -0.029 +0.0068404 0.0187938 -0.029 +0.0187938 0.0068404 -0.029 +0.0173205 -0.01 -0.029 +0.01 -0.0173205 -0.029 +-0.01 -0.0173205 -0.029 +-0.0173205 -0.01 -0.029 +-0.0173205 0.01 -0.029 +-0.01 0.0173205 -0.029 +0.01 0.0173205 -0.029 +0.0173205 0.01 -0.029 +0.02 4.89859e-18 -0.029 +1.22465e-18 -0.02 -0.029 +-0.02 -2.44929e-18 -0.029 +-3.67394e-18 0.02 -0.029 +0.0153209 -0.0128558 -0.029 +0.0128558 -0.0153209 -0.029 +-0.0128558 -0.0153209 -0.029 +-0.0153209 -0.0128558 -0.029 +-0.0153209 0.0128558 -0.029 +-0.0128558 0.0153209 -0.029 +0.0128558 0.0153209 -0.029 +0.0153209 0.0128558 -0.029 +0.0196962 -0.00347296 -0.029 +0.00347296 -0.0196962 -0.029 +-0.00347296 -0.0196962 -0.029 +-0.0196962 -0.00347296 -0.029 +-0.0196962 0.00347296 -0.029 +-0.00347296 0.0196962 -0.029 +0.00347296 0.0196962 -0.029 +0.0196962 0.00347296 -0.029 +0.0187938 -0.0068404 -0.048 +0.0068404 -0.0187938 -0.048 +-0.0068404 -0.0187938 -0.048 +-0.0187938 -0.0068404 -0.048 +-0.0187938 0.0068404 -0.048 +-0.0068404 0.0187938 -0.048 +0.0068404 0.0187938 -0.048 +0.0187938 0.0068404 -0.048 +0.0173205 -0.01 -0.048 +0.01 -0.0173205 -0.048 +-0.01 -0.0173205 -0.048 +-0.0173205 -0.01 -0.048 +-0.0173205 0.01 -0.048 +-0.01 0.0173205 -0.048 +0.01 0.0173205 -0.048 +0.0173205 0.01 -0.048 +0.02 4.89859e-18 -0.048 +1.22465e-18 -0.02 -0.048 +-0.02 -2.44929e-18 -0.048 +-3.67394e-18 0.02 -0.048 +0.0153209 -0.0128558 -0.048 +0.0128558 -0.0153209 -0.048 +-0.0128558 -0.0153209 -0.048 +-0.0153209 -0.0128558 -0.048 +-0.0153209 0.0128558 -0.048 +-0.0128558 0.0153209 -0.048 +0.0128558 0.0153209 -0.048 +0.0153209 0.0128558 -0.048 +0.0196962 -0.00347296 -0.048 +0.00347296 -0.0196962 -0.048 +-0.00347296 -0.0196962 -0.048 +-0.0196962 -0.00347296 -0.048 +-0.0196962 0.00347296 -0.048 +-0.00347296 0.0196962 -0.048 +0.00347296 0.0196962 -0.048 +0.0196962 0.00347296 -0.048 +0.0187938 -0.0068404 -0.067 +0.0068404 -0.0187938 -0.067 +-0.0068404 -0.0187938 -0.067 +-0.0187938 -0.0068404 -0.067 +-0.0187938 0.0068404 -0.067 +-0.0068404 0.0187938 -0.067 +0.0068404 0.0187938 -0.067 +0.0187938 0.0068404 -0.067 +0.0173205 -0.01 -0.067 +0.01 -0.0173205 -0.067 +-0.01 -0.0173205 -0.067 +-0.0173205 -0.01 -0.067 +-0.0173205 0.01 -0.067 +-0.01 0.0173205 -0.067 +0.01 0.0173205 -0.067 +0.0173205 0.01 -0.067 +0.02 4.89859e-18 -0.067 +1.22465e-18 -0.02 -0.067 +-0.02 -2.44929e-18 -0.067 +-3.67394e-18 0.02 -0.067 +0.0153209 -0.0128558 -0.067 +0.0128558 -0.0153209 -0.067 +-0.0128558 -0.0153209 -0.067 +-0.0153209 -0.0128558 -0.067 +-0.0153209 0.0128558 -0.067 +-0.0128558 0.0153209 -0.067 +0.0128558 0.0153209 -0.067 +0.0153209 0.0128558 -0.067 +0.0196962 -0.00347296 -0.067 +0.00347296 -0.0196962 -0.067 +-0.00347296 -0.0196962 -0.067 +-0.0196962 -0.00347296 -0.067 +-0.0196962 0.00347296 -0.067 +-0.00347296 0.0196962 -0.067 +0.00347296 0.0196962 -0.067 +0.0196962 0.00347296 -0.067 +0.0187938 -0.0068404 -0.086 +0.0068404 -0.0187938 -0.086 +-0.0068404 -0.0187938 -0.086 +-0.0187938 -0.0068404 -0.086 +-0.0187938 0.0068404 -0.086 +-0.0068404 0.0187938 -0.086 +0.0068404 0.0187938 -0.086 +0.0187938 0.0068404 -0.086 +0.0173205 -0.01 -0.086 +0.01 -0.0173205 -0.086 +-0.01 -0.0173205 -0.086 +-0.0173205 -0.01 -0.086 +-0.0173205 0.01 -0.086 +-0.01 0.0173205 -0.086 +0.01 0.0173205 -0.086 +0.0173205 0.01 -0.086 +0.02 4.89859e-18 -0.086 +1.22465e-18 -0.02 -0.086 +-0.02 -2.44929e-18 -0.086 +-3.67394e-18 0.02 -0.086 +0.0153209 -0.0128558 -0.086 +0.0128558 -0.0153209 -0.086 +-0.0128558 -0.0153209 -0.086 +-0.0153209 -0.0128558 -0.086 +-0.0153209 0.0128558 -0.086 +-0.0128558 0.0153209 -0.086 +0.0128558 0.0153209 -0.086 +0.0153209 0.0128558 -0.086 +0.0196962 -0.00347296 -0.086 +0.00347296 -0.0196962 -0.086 +-0.00347296 -0.0196962 -0.086 +-0.0196962 -0.00347296 -0.086 +-0.0196962 0.00347296 -0.086 +-0.00347296 0.0196962 -0.086 +0.00347296 0.0196962 -0.086 +0.0196962 0.00347296 -0.086 +0.0866025 -0.05 0 +0.05 -0.0866025 0 +-0.05 -0.0866025 0 +-0.0866025 -0.05 0 +-0.0866025 0.05 0 +-0.05 0.0866025 0 +0.05 0.0866025 0 +0.0866025 0.05 0 +0.0766044 -0.0642788 0 +0.0642788 -0.0766044 0 +-0.0642788 -0.0766044 0 +-0.0766044 -0.0642788 0 +-0.0766044 0.0642788 0 +-0.0642788 0.0766044 0 +0.0642788 0.0766044 0 +0.0766044 0.0642788 0 +0.1 2.44929e-17 0 +6.12323e-18 -0.1 0 +-0.1 -1.22465e-17 0 +-1.83697e-17 0.1 0 +0.0984808 -0.0173648 0 +0.0173648 -0.0984808 0 +-0.0173648 -0.0984808 0 +-0.0984808 -0.0173648 0 +-0.0984808 0.0173648 0 +-0.0173648 0.0984808 0 +0.0173648 0.0984808 0 +0.0984808 0.0173648 0 +0.0939693 -0.034202 0 +0.034202 -0.0939693 0 +-0.034202 -0.0939693 0 +-0.0939693 -0.034202 0 +-0.0939693 0.034202 0 +-0.034202 0.0939693 0 +0.034202 0.0939693 0 +0.0939693 0.034202 0 +0.0866025 -0.05 -0.01 +0.05 -0.0866025 -0.01 +-0.05 -0.0866025 -0.01 +-0.0866025 -0.05 -0.01 +-0.0866025 0.05 -0.01 +-0.05 0.0866025 -0.01 +0.05 0.0866025 -0.01 +0.0866025 0.05 -0.01 +0.0766044 -0.0642788 -0.01 +0.0642788 -0.0766044 -0.01 +-0.0642788 -0.0766044 -0.01 +-0.0766044 -0.0642788 -0.01 +-0.0766044 0.0642788 -0.01 +-0.0642788 0.0766044 -0.01 +0.0642788 0.0766044 -0.01 +0.0766044 0.0642788 -0.01 +0.1 2.44929e-17 -0.01 +6.12323e-18 -0.1 -0.01 +-0.1 -1.22465e-17 -0.01 +-1.83697e-17 0.1 -0.01 +0.0984808 -0.0173648 -0.01 +0.0173648 -0.0984808 -0.01 +-0.0173648 -0.0984808 -0.01 +-0.0984808 -0.0173648 -0.01 +-0.0984808 0.0173648 -0.01 +-0.0173648 0.0984808 -0.01 +0.0173648 0.0984808 -0.01 +0.0984808 0.0173648 -0.01 +0.0939693 -0.034202 -0.01 +0.034202 -0.0939693 -0.01 +-0.034202 -0.0939693 -0.01 +-0.0939693 -0.034202 -0.01 +-0.0939693 0.034202 -0.01 +-0.034202 0.0939693 -0.01 +0.034202 0.0939693 -0.01 +0.0939693 0.034202 -0.01 +0.0866025 -0.05 -0.02 +0.05 -0.0866025 -0.02 +-0.05 -0.0866025 -0.02 +-0.0866025 -0.05 -0.02 +-0.0866025 0.05 -0.02 +-0.05 0.0866025 -0.02 +0.05 0.0866025 -0.02 +0.0866025 0.05 -0.02 +0.0766044 -0.0642788 -0.02 +0.0642788 -0.0766044 -0.02 +-0.0642788 -0.0766044 -0.02 +-0.0766044 -0.0642788 -0.02 +-0.0766044 0.0642788 -0.02 +-0.0642788 0.0766044 -0.02 +0.0642788 0.0766044 -0.02 +0.0766044 0.0642788 -0.02 +0.1 2.44929e-17 -0.02 +6.12323e-18 -0.1 -0.02 +-0.1 -1.22465e-17 -0.02 +-1.83697e-17 0.1 -0.02 +0.0984808 -0.0173648 -0.02 +0.0173648 -0.0984808 -0.02 +-0.0173648 -0.0984808 -0.02 +-0.0984808 -0.0173648 -0.02 +-0.0984808 0.0173648 -0.02 +-0.0173648 0.0984808 -0.02 +0.0173648 0.0984808 -0.02 +0.0984808 0.0173648 -0.02 +0.0939693 -0.034202 -0.02 +0.034202 -0.0939693 -0.02 +-0.034202 -0.0939693 -0.02 +-0.0939693 -0.034202 -0.02 +-0.0939693 0.034202 -0.02 +-0.034202 0.0939693 -0.02 +0.034202 0.0939693 -0.02 +0.0939693 0.034202 -0.02 +0.0866025 -0.05 -0.03 +0.05 -0.0866025 -0.03 +-0.05 -0.0866025 -0.03 +-0.0866025 -0.05 -0.03 +-0.0866025 0.05 -0.03 +-0.05 0.0866025 -0.03 +0.05 0.0866025 -0.03 +0.0866025 0.05 -0.03 +0.0766044 -0.0642788 -0.03 +0.0642788 -0.0766044 -0.03 +-0.0642788 -0.0766044 -0.03 +-0.0766044 -0.0642788 -0.03 +-0.0766044 0.0642788 -0.03 +-0.0642788 0.0766044 -0.03 +0.0642788 0.0766044 -0.03 +0.0766044 0.0642788 -0.03 +0.1 -2.44929e-17 -0.03 +-1.83697e-17 -0.1 -0.03 +-0.1 1.22465e-17 -0.03 +6.12323e-18 0.1 -0.03 +0.0984808 -0.0173648 -0.03 +0.0173648 -0.0984808 -0.03 +-0.0173648 -0.0984808 -0.03 +-0.0984808 -0.0173648 -0.03 +-0.0984808 0.0173648 -0.03 +-0.0173648 0.0984808 -0.03 +0.0173648 0.0984808 -0.03 +0.0984808 0.0173648 -0.03 +0.0939693 -0.034202 -0.03 +0.034202 -0.0939693 -0.03 +-0.034202 -0.0939693 -0.03 +-0.0939693 -0.034202 -0.03 +-0.0939693 0.034202 -0.03 +-0.034202 0.0939693 -0.03 +0.034202 0.0939693 -0.03 +0.0939693 0.034202 -0.03 +0.0187938 -0.0068404 -0.105 +0.0068404 -0.0187938 -0.105 +-0.0068404 -0.0187938 -0.105 +-0.0187938 -0.0068404 -0.105 +-0.0187938 0.0068404 -0.105 +-0.0068404 0.0187938 -0.105 +0.0068404 0.0187938 -0.105 +0.0187938 0.0068404 -0.105 +0.0173205 -0.01 -0.105 +0.01 -0.0173205 -0.105 +-0.01 -0.0173205 -0.105 +-0.0173205 -0.01 -0.105 +-0.0173205 0.01 -0.105 +-0.01 0.0173205 -0.105 +0.01 0.0173205 -0.105 +0.0173205 0.01 -0.105 +0.02 4.89859e-18 -0.105 +1.22465e-18 -0.02 -0.105 +-0.02 -2.44929e-18 -0.105 +-3.67394e-18 0.02 -0.105 +0.0153209 -0.0128558 -0.105 +0.0128558 -0.0153209 -0.105 +-0.0128558 -0.0153209 -0.105 +-0.0153209 -0.0128558 -0.105 +-0.0153209 0.0128558 -0.105 +-0.0128558 0.0153209 -0.105 +0.0128558 0.0153209 -0.105 +0.0153209 0.0128558 -0.105 +0.0196962 -0.00347296 -0.105 +0.00347296 -0.0196962 -0.105 +-0.00347296 -0.0196962 -0.105 +-0.0196962 -0.00347296 -0.105 +-0.0196962 0.00347296 -0.105 +-0.00347296 0.0196962 -0.105 +0.00347296 0.0196962 -0.105 +0.0196962 0.00347296 -0.105 +0.0187938 -0.0068404 -0.124 +0.0068404 -0.0187938 -0.124 +-0.0068404 -0.0187938 -0.124 +-0.0187938 -0.0068404 -0.124 +-0.0187938 0.0068404 -0.124 +-0.0068404 0.0187938 -0.124 +0.0068404 0.0187938 -0.124 +0.0187938 0.0068404 -0.124 +0.0173205 -0.01 -0.124 +0.01 -0.0173205 -0.124 +-0.01 -0.0173205 -0.124 +-0.0173205 -0.01 -0.124 +-0.0173205 0.01 -0.124 +-0.01 0.0173205 -0.124 +0.01 0.0173205 -0.124 +0.0173205 0.01 -0.124 +0.02 4.89859e-18 -0.124 +1.22465e-18 -0.02 -0.124 +-0.02 -2.44929e-18 -0.124 +-3.67394e-18 0.02 -0.124 +0.0153209 -0.0128558 -0.124 +0.0128558 -0.0153209 -0.124 +-0.0128558 -0.0153209 -0.124 +-0.0153209 -0.0128558 -0.124 +-0.0153209 0.0128558 -0.124 +-0.0128558 0.0153209 -0.124 +0.0128558 0.0153209 -0.124 +0.0153209 0.0128558 -0.124 +0.0196962 -0.00347296 -0.124 +0.00347296 -0.0196962 -0.124 +-0.00347296 -0.0196962 -0.124 +-0.0196962 -0.00347296 -0.124 +-0.0196962 0.00347296 -0.124 +-0.00347296 0.0196962 -0.124 +0.00347296 0.0196962 -0.124 +0.0196962 0.00347296 -0.124 +0.0187938 -0.0068404 -0.143 +0.0068404 -0.0187938 -0.143 +-0.0068404 -0.0187938 -0.143 +-0.0187938 -0.0068404 -0.143 +-0.0187938 0.0068404 -0.143 +-0.0068404 0.0187938 -0.143 +0.0068404 0.0187938 -0.143 +0.0187938 0.0068404 -0.143 +0.0173205 -0.01 -0.143 +0.01 -0.0173205 -0.143 +-0.01 -0.0173205 -0.143 +-0.0173205 -0.01 -0.143 +-0.0173205 0.01 -0.143 +-0.01 0.0173205 -0.143 +0.01 0.0173205 -0.143 +0.0173205 0.01 -0.143 +0.02 4.89859e-18 -0.143 +1.22465e-18 -0.02 -0.143 +-0.02 -2.44929e-18 -0.143 +-3.67394e-18 0.02 -0.143 +0.0153209 -0.0128558 -0.143 +0.0128558 -0.0153209 -0.143 +-0.0128558 -0.0153209 -0.143 +-0.0153209 -0.0128558 -0.143 +-0.0153209 0.0128558 -0.143 +-0.0128558 0.0153209 -0.143 +0.0128558 0.0153209 -0.143 +0.0153209 0.0128558 -0.143 +0.0196962 -0.00347296 -0.143 +0.00347296 -0.0196962 -0.143 +-0.00347296 -0.0196962 -0.143 +-0.0196962 -0.00347296 -0.143 +-0.0196962 0.00347296 -0.143 +-0.00347296 0.0196962 -0.143 +0.00347296 0.0196962 -0.143 +0.0196962 0.00347296 -0.143 +0.0187938 -0.0068404 -0.162 +0.0068404 -0.0187938 -0.162 +-0.0068404 -0.0187938 -0.162 +-0.0187938 -0.0068404 -0.162 +-0.0187938 0.0068404 -0.162 +-0.0068404 0.0187938 -0.162 +0.0068404 0.0187938 -0.162 +0.0187938 0.0068404 -0.162 +0.0173205 -0.01 -0.162 +0.01 -0.0173205 -0.162 +-0.01 -0.0173205 -0.162 +-0.0173205 -0.01 -0.162 +-0.0173205 0.01 -0.162 +-0.01 0.0173205 -0.162 +0.01 0.0173205 -0.162 +0.0173205 0.01 -0.162 +0.02 4.89859e-18 -0.162 +1.22465e-18 -0.02 -0.162 +-0.02 -2.44929e-18 -0.162 +-3.67394e-18 0.02 -0.162 +0.0153209 -0.0128558 -0.162 +0.0128558 -0.0153209 -0.162 +-0.0128558 -0.0153209 -0.162 +-0.0153209 -0.0128558 -0.162 +-0.0153209 0.0128558 -0.162 +-0.0128558 0.0153209 -0.162 +0.0128558 0.0153209 -0.162 +0.0153209 0.0128558 -0.162 +0.0196962 -0.00347296 -0.162 +0.00347296 -0.0196962 -0.162 +-0.00347296 -0.0196962 -0.162 +-0.0196962 -0.00347296 -0.162 +-0.0196962 0.00347296 -0.162 +-0.00347296 0.0196962 -0.162 +0.00347296 0.0196962 -0.162 +0.0196962 0.00347296 -0.162 +0.0187938 -0.0068404 -0.181 +0.0068404 -0.0187938 -0.181 +-0.0068404 -0.0187938 -0.181 +-0.0187938 -0.0068404 -0.181 +-0.0187938 0.0068404 -0.181 +-0.0068404 0.0187938 -0.181 +0.0068404 0.0187938 -0.181 +0.0187938 0.0068404 -0.181 +0.0173205 -0.01 -0.181 +0.01 -0.0173205 -0.181 +-0.01 -0.0173205 -0.181 +-0.0173205 -0.01 -0.181 +-0.0173205 0.01 -0.181 +-0.01 0.0173205 -0.181 +0.01 0.0173205 -0.181 +0.0173205 0.01 -0.181 +0.02 4.89859e-18 -0.181 +1.22465e-18 -0.02 -0.181 +-0.02 -2.44929e-18 -0.181 +-3.67394e-18 0.02 -0.181 +0.0153209 -0.0128558 -0.181 +0.0128558 -0.0153209 -0.181 +-0.0128558 -0.0153209 -0.181 +-0.0153209 -0.0128558 -0.181 +-0.0153209 0.0128558 -0.181 +-0.0128558 0.0153209 -0.181 +0.0128558 0.0153209 -0.181 +0.0153209 0.0128558 -0.181 +0.0196962 -0.00347296 -0.181 +0.00347296 -0.0196962 -0.181 +-0.00347296 -0.0196962 -0.181 +-0.0196962 -0.00347296 -0.181 +-0.0196962 0.00347296 -0.181 +-0.00347296 0.0196962 -0.181 +0.00347296 0.0196962 -0.181 +0.0196962 0.00347296 -0.181 +0.0187938 -0.0068404 -0.2 +0.0068404 -0.0187938 -0.2 +-0.0068404 -0.0187938 -0.2 +-0.0187938 -0.0068404 -0.2 +-0.0187938 0.0068404 -0.2 +-0.0068404 0.0187938 -0.2 +0.0068404 0.0187938 -0.2 +0.0187938 0.0068404 -0.2 +0.0173205 -0.01 -0.2 +0.01 -0.0173205 -0.2 +-0.01 -0.0173205 -0.2 +-0.0173205 -0.01 -0.2 +-0.0173205 0.01 -0.2 +-0.01 0.0173205 -0.2 +0.01 0.0173205 -0.2 +0.0173205 0.01 -0.2 +0.02 4.89859e-18 -0.2 +1.22465e-18 -0.02 -0.2 +-0.02 -2.44929e-18 -0.2 +-3.67394e-18 0.02 -0.2 +0.0153209 -0.0128558 -0.2 +0.0128558 -0.0153209 -0.2 +-0.0128558 -0.0153209 -0.2 +-0.0153209 -0.0128558 -0.2 +-0.0153209 0.0128558 -0.2 +-0.0128558 0.0153209 -0.2 +0.0128558 0.0153209 -0.2 +0.0153209 0.0128558 -0.2 +0.0196962 -0.00347296 -0.2 +0.00347296 -0.0196962 -0.2 +-0.00347296 -0.0196962 -0.2 +-0.0196962 -0.00347296 -0.2 +-0.0196962 0.00347296 -0.2 +-0.00347296 0.0196962 -0.2 +0.00347296 0.0196962 -0.2 +0.0196962 0.00347296 -0.2 + +POLYGONS 972 3888 +3 309 305 269 +3 273 309 269 +3 273 269 233 +3 237 273 233 +3 237 233 197 +3 201 237 197 +3 317 309 273 +3 281 317 273 +3 281 273 237 +3 245 281 237 +3 245 237 201 +3 209 245 201 +3 289 317 281 +3 253 289 281 +3 253 281 245 +3 217 253 245 +3 217 245 209 +3 181 217 209 +3 297 289 253 +3 261 297 253 +3 261 253 217 +3 225 261 217 +3 225 217 181 +3 189 225 181 +3 298 297 261 +3 262 298 261 +3 262 261 225 +3 226 262 225 +3 226 225 189 +3 190 226 189 +3 290 298 262 +3 254 290 262 +3 254 262 226 +3 218 254 226 +3 218 226 190 +3 182 218 190 +3 318 290 254 +3 282 318 254 +3 282 254 218 +3 246 282 218 +3 246 218 182 +3 210 246 182 +3 310 318 282 +3 274 310 282 +3 274 282 246 +3 238 274 246 +3 238 246 210 +3 202 238 210 +3 306 310 274 +3 270 306 274 +3 270 274 238 +3 234 270 238 +3 234 238 202 +3 198 234 202 +3 311 306 270 +3 275 311 270 +3 275 270 234 +3 239 275 234 +3 239 234 198 +3 203 239 198 +3 319 311 275 +3 283 319 275 +3 283 275 239 +3 247 283 239 +3 247 239 203 +3 211 247 203 +3 291 319 283 +3 255 291 283 +3 255 283 247 +3 219 255 247 +3 219 247 211 +3 183 219 211 +3 299 291 255 +3 263 299 255 +3 263 255 219 +3 227 263 219 +3 227 219 183 +3 191 227 183 +3 300 299 263 +3 264 300 263 +3 264 263 227 +3 228 264 227 +3 228 227 191 +3 192 228 191 +3 292 300 264 +3 256 292 264 +3 256 264 228 +3 220 256 228 +3 220 228 192 +3 184 220 192 +3 320 292 256 +3 284 320 256 +3 284 256 220 +3 248 284 220 +3 248 220 184 +3 212 248 184 +3 312 320 284 +3 276 312 284 +3 276 284 248 +3 240 276 248 +3 240 248 212 +3 204 240 212 +3 307 312 276 +3 271 307 276 +3 271 276 240 +3 235 271 240 +3 235 240 204 +3 199 235 204 +3 313 307 271 +3 277 313 271 +3 277 271 235 +3 241 277 235 +3 241 235 199 +3 205 241 199 +3 321 313 277 +3 285 321 277 +3 285 277 241 +3 249 285 241 +3 249 241 205 +3 213 249 205 +3 293 321 285 +3 257 293 285 +3 257 285 249 +3 221 257 249 +3 221 249 213 +3 185 221 213 +3 301 293 257 +3 265 301 257 +3 265 257 221 +3 229 265 221 +3 229 221 185 +3 193 229 185 +3 302 301 265 +3 266 302 265 +3 266 265 229 +3 230 266 229 +3 230 229 193 +3 194 230 193 +3 294 302 266 +3 258 294 266 +3 258 266 230 +3 222 258 230 +3 222 230 194 +3 186 222 194 +3 322 294 258 +3 286 322 258 +3 286 258 222 +3 250 286 222 +3 250 222 186 +3 214 250 186 +3 314 322 286 +3 278 314 286 +3 278 286 250 +3 242 278 250 +3 242 250 214 +3 206 242 214 +3 308 314 278 +3 272 308 278 +3 272 278 242 +3 236 272 242 +3 236 242 206 +3 200 236 206 +3 315 308 272 +3 279 315 272 +3 279 272 236 +3 243 279 236 +3 243 236 200 +3 207 243 200 +3 323 315 279 +3 287 323 279 +3 287 279 243 +3 251 287 243 +3 251 243 207 +3 215 251 207 +3 295 323 287 +3 259 295 287 +3 259 287 251 +3 223 259 251 +3 223 251 215 +3 187 223 215 +3 303 295 259 +3 267 303 259 +3 267 259 223 +3 231 267 223 +3 231 223 187 +3 195 231 187 +3 304 303 267 +3 268 304 267 +3 268 267 231 +3 232 268 231 +3 232 231 195 +3 196 232 195 +3 296 304 268 +3 260 296 268 +3 260 268 232 +3 224 260 232 +3 224 232 196 +3 188 224 196 +3 324 296 260 +3 288 324 260 +3 288 260 224 +3 252 288 224 +3 252 224 188 +3 216 252 188 +3 316 324 288 +3 280 316 288 +3 280 288 252 +3 244 280 252 +3 244 252 216 +3 208 244 216 +3 305 316 280 +3 269 305 280 +3 269 280 244 +3 233 269 244 +3 233 244 208 +3 197 233 208 +3 316 36 305 +3 324 36 316 +3 296 36 324 +3 304 36 296 +3 303 36 304 +3 295 36 303 +3 323 36 295 +3 315 36 323 +3 308 36 315 +3 314 36 308 +3 322 36 314 +3 294 36 322 +3 302 36 294 +3 301 36 302 +3 293 36 301 +3 321 36 293 +3 313 36 321 +3 307 36 313 +3 312 36 307 +3 320 36 312 +3 292 36 320 +3 300 36 292 +3 299 36 300 +3 291 36 299 +3 319 36 291 +3 311 36 319 +3 306 36 311 +3 310 36 306 +3 318 36 310 +3 290 36 318 +3 298 36 290 +3 297 36 298 +3 289 36 297 +3 317 36 289 +3 309 36 317 +3 305 36 309 +3 533 521 485 +3 497 533 485 +3 497 485 449 +3 461 497 449 +3 461 449 413 +3 425 461 413 +3 425 413 377 +3 389 425 377 +3 389 377 341 +3 353 389 341 +3 353 341 161 +3 173 353 161 +3 173 161 125 +3 137 173 125 +3 137 125 89 +3 101 137 89 +3 101 89 53 +3 65 101 53 +3 65 53 16 +3 28 65 16 +3 505 533 497 +3 469 505 497 +3 469 497 461 +3 433 469 461 +3 433 461 425 +3 397 433 425 +3 397 425 389 +3 361 397 389 +3 361 389 353 +3 325 361 353 +3 325 353 173 +3 145 325 173 +3 145 173 137 +3 109 145 137 +3 109 137 101 +3 73 109 101 +3 73 101 65 +3 37 73 65 +3 37 65 28 +3 0 37 28 +3 513 505 469 +3 477 513 469 +3 477 469 433 +3 441 477 433 +3 441 433 397 +3 405 441 397 +3 405 397 361 +3 369 405 361 +3 369 361 325 +3 333 369 325 +3 333 325 145 +3 153 333 145 +3 153 145 109 +3 117 153 109 +3 117 109 73 +3 81 117 73 +3 81 73 37 +3 45 81 37 +3 45 37 0 +3 8 45 0 +3 525 513 477 +3 489 525 477 +3 489 477 441 +3 453 489 441 +3 453 441 405 +3 417 453 405 +3 417 405 369 +3 381 417 369 +3 381 369 333 +3 345 381 333 +3 345 333 153 +3 165 345 153 +3 165 153 117 +3 129 165 117 +3 129 117 81 +3 93 129 81 +3 93 81 45 +3 57 93 45 +3 57 45 8 +3 20 57 8 +3 526 525 489 +3 490 526 489 +3 490 489 453 +3 454 490 453 +3 454 453 417 +3 418 454 417 +3 418 417 381 +3 382 418 381 +3 382 381 345 +3 346 382 345 +3 346 345 165 +3 166 346 165 +3 166 165 129 +3 130 166 129 +3 130 129 93 +3 94 130 93 +3 94 93 57 +3 58 94 57 +3 58 57 20 +3 21 58 20 +3 514 526 490 +3 478 514 490 +3 478 490 454 +3 442 478 454 +3 442 454 418 +3 406 442 418 +3 406 418 382 +3 370 406 382 +3 370 382 346 +3 334 370 346 +3 334 346 166 +3 154 334 166 +3 154 166 130 +3 118 154 130 +3 118 130 94 +3 82 118 94 +3 82 94 58 +3 46 82 58 +3 46 58 21 +3 9 46 21 +3 506 514 478 +3 470 506 478 +3 470 478 442 +3 434 470 442 +3 434 442 406 +3 398 434 406 +3 398 406 370 +3 362 398 370 +3 362 370 334 +3 326 362 334 +3 326 334 154 +3 146 326 154 +3 146 154 118 +3 110 146 118 +3 110 118 82 +3 74 110 82 +3 74 82 46 +3 38 74 46 +3 38 46 9 +3 1 38 9 +3 534 506 470 +3 498 534 470 +3 498 470 434 +3 462 498 434 +3 462 434 398 +3 426 462 398 +3 426 398 362 +3 390 426 362 +3 390 362 326 +3 354 390 326 +3 354 326 146 +3 174 354 146 +3 174 146 110 +3 138 174 110 +3 138 110 74 +3 102 138 74 +3 102 74 38 +3 66 102 38 +3 66 38 1 +3 29 66 1 +3 522 534 498 +3 486 522 498 +3 486 498 462 +3 450 486 462 +3 450 462 426 +3 414 450 426 +3 414 426 390 +3 378 414 390 +3 378 390 354 +3 342 378 354 +3 342 354 174 +3 162 342 174 +3 162 174 138 +3 126 162 138 +3 126 138 102 +3 90 126 102 +3 90 102 66 +3 54 90 66 +3 54 66 29 +3 17 54 29 +3 535 522 486 +3 499 535 486 +3 499 486 450 +3 463 499 450 +3 463 450 414 +3 427 463 414 +3 427 414 378 +3 391 427 378 +3 391 378 342 +3 355 391 342 +3 355 342 162 +3 175 355 162 +3 175 162 126 +3 139 175 126 +3 139 126 90 +3 103 139 90 +3 103 90 54 +3 67 103 54 +3 67 54 17 +3 30 67 17 +3 507 535 499 +3 471 507 499 +3 471 499 463 +3 435 471 463 +3 435 463 427 +3 399 435 427 +3 399 427 391 +3 363 399 391 +3 363 391 355 +3 327 363 355 +3 327 355 175 +3 147 327 175 +3 147 175 139 +3 111 147 139 +3 111 139 103 +3 75 111 103 +3 75 103 67 +3 39 75 67 +3 39 67 30 +3 2 39 30 +3 515 507 471 +3 479 515 471 +3 479 471 435 +3 443 479 435 +3 443 435 399 +3 407 443 399 +3 407 399 363 +3 371 407 363 +3 371 363 327 +3 335 371 327 +3 335 327 147 +3 155 335 147 +3 155 147 111 +3 119 155 111 +3 119 111 75 +3 83 119 75 +3 83 75 39 +3 47 83 39 +3 47 39 2 +3 10 47 2 +3 527 515 479 +3 491 527 479 +3 491 479 443 +3 455 491 443 +3 455 443 407 +3 419 455 407 +3 419 407 371 +3 383 419 371 +3 383 371 335 +3 347 383 335 +3 347 335 155 +3 167 347 155 +3 167 155 119 +3 131 167 119 +3 131 119 83 +3 95 131 83 +3 95 83 47 +3 59 95 47 +3 59 47 10 +3 22 59 10 +3 528 527 491 +3 492 528 491 +3 492 491 455 +3 456 492 455 +3 456 455 419 +3 420 456 419 +3 420 419 383 +3 384 420 383 +3 384 383 347 +3 348 384 347 +3 348 347 167 +3 168 348 167 +3 168 167 131 +3 132 168 131 +3 132 131 95 +3 96 132 95 +3 96 95 59 +3 60 96 59 +3 60 59 22 +3 23 60 22 +3 516 528 492 +3 480 516 492 +3 480 492 456 +3 444 480 456 +3 444 456 420 +3 408 444 420 +3 408 420 384 +3 372 408 384 +3 372 384 348 +3 336 372 348 +3 336 348 168 +3 156 336 168 +3 156 168 132 +3 120 156 132 +3 120 132 96 +3 84 120 96 +3 84 96 60 +3 48 84 60 +3 48 60 23 +3 11 48 23 +3 508 516 480 +3 472 508 480 +3 472 480 444 +3 436 472 444 +3 436 444 408 +3 400 436 408 +3 400 408 372 +3 364 400 372 +3 364 372 336 +3 328 364 336 +3 328 336 156 +3 148 328 156 +3 148 156 120 +3 112 148 120 +3 112 120 84 +3 76 112 84 +3 76 84 48 +3 40 76 48 +3 40 48 11 +3 3 40 11 +3 536 508 472 +3 500 536 472 +3 500 472 436 +3 464 500 436 +3 464 436 400 +3 428 464 400 +3 428 400 364 +3 392 428 364 +3 392 364 328 +3 356 392 328 +3 356 328 148 +3 176 356 148 +3 176 148 112 +3 140 176 112 +3 140 112 76 +3 104 140 76 +3 104 76 40 +3 68 104 40 +3 68 40 3 +3 31 68 3 +3 523 536 500 +3 487 523 500 +3 487 500 464 +3 451 487 464 +3 451 464 428 +3 415 451 428 +3 415 428 392 +3 379 415 392 +3 379 392 356 +3 343 379 356 +3 343 356 176 +3 163 343 176 +3 163 176 140 +3 127 163 140 +3 127 140 104 +3 91 127 104 +3 91 104 68 +3 55 91 68 +3 55 68 31 +3 18 55 31 +3 537 523 487 +3 501 537 487 +3 501 487 451 +3 465 501 451 +3 465 451 415 +3 429 465 415 +3 429 415 379 +3 393 429 379 +3 393 379 343 +3 357 393 343 +3 357 343 163 +3 177 357 163 +3 177 163 127 +3 141 177 127 +3 141 127 91 +3 105 141 91 +3 105 91 55 +3 69 105 55 +3 69 55 18 +3 32 69 18 +3 509 537 501 +3 473 509 501 +3 473 501 465 +3 437 473 465 +3 437 465 429 +3 401 437 429 +3 401 429 393 +3 365 401 393 +3 365 393 357 +3 329 365 357 +3 329 357 177 +3 149 329 177 +3 149 177 141 +3 113 149 141 +3 113 141 105 +3 77 113 105 +3 77 105 69 +3 41 77 69 +3 41 69 32 +3 4 41 32 +3 517 509 473 +3 481 517 473 +3 481 473 437 +3 445 481 437 +3 445 437 401 +3 409 445 401 +3 409 401 365 +3 373 409 365 +3 373 365 329 +3 337 373 329 +3 337 329 149 +3 157 337 149 +3 157 149 113 +3 121 157 113 +3 121 113 77 +3 85 121 77 +3 85 77 41 +3 49 85 41 +3 49 41 4 +3 12 49 4 +3 529 517 481 +3 493 529 481 +3 493 481 445 +3 457 493 445 +3 457 445 409 +3 421 457 409 +3 421 409 373 +3 385 421 373 +3 385 373 337 +3 349 385 337 +3 349 337 157 +3 169 349 157 +3 169 157 121 +3 133 169 121 +3 133 121 85 +3 97 133 85 +3 97 85 49 +3 61 97 49 +3 61 49 12 +3 24 61 12 +3 530 529 493 +3 494 530 493 +3 494 493 457 +3 458 494 457 +3 458 457 421 +3 422 458 421 +3 422 421 385 +3 386 422 385 +3 386 385 349 +3 350 386 349 +3 350 349 169 +3 170 350 169 +3 170 169 133 +3 134 170 133 +3 134 133 97 +3 98 134 97 +3 98 97 61 +3 62 98 61 +3 62 61 24 +3 25 62 24 +3 518 530 494 +3 482 518 494 +3 482 494 458 +3 446 482 458 +3 446 458 422 +3 410 446 422 +3 410 422 386 +3 374 410 386 +3 374 386 350 +3 338 374 350 +3 338 350 170 +3 158 338 170 +3 158 170 134 +3 122 158 134 +3 122 134 98 +3 86 122 98 +3 86 98 62 +3 50 86 62 +3 50 62 25 +3 13 50 25 +3 510 518 482 +3 474 510 482 +3 474 482 446 +3 438 474 446 +3 438 446 410 +3 402 438 410 +3 402 410 374 +3 366 402 374 +3 366 374 338 +3 330 366 338 +3 330 338 158 +3 150 330 158 +3 150 158 122 +3 114 150 122 +3 114 122 86 +3 78 114 86 +3 78 86 50 +3 42 78 50 +3 42 50 13 +3 5 42 13 +3 538 510 474 +3 502 538 474 +3 502 474 438 +3 466 502 438 +3 466 438 402 +3 430 466 402 +3 430 402 366 +3 394 430 366 +3 394 366 330 +3 358 394 330 +3 358 330 150 +3 178 358 150 +3 178 150 114 +3 142 178 114 +3 142 114 78 +3 106 142 78 +3 106 78 42 +3 70 106 42 +3 70 42 5 +3 33 70 5 +3 524 538 502 +3 488 524 502 +3 488 502 466 +3 452 488 466 +3 452 466 430 +3 416 452 430 +3 416 430 394 +3 380 416 394 +3 380 394 358 +3 344 380 358 +3 344 358 178 +3 164 344 178 +3 164 178 142 +3 128 164 142 +3 128 142 106 +3 92 128 106 +3 92 106 70 +3 56 92 70 +3 56 70 33 +3 19 56 33 +3 539 524 488 +3 503 539 488 +3 503 488 452 +3 467 503 452 +3 467 452 416 +3 431 467 416 +3 431 416 380 +3 395 431 380 +3 395 380 344 +3 359 395 344 +3 359 344 164 +3 179 359 164 +3 179 164 128 +3 143 179 128 +3 143 128 92 +3 107 143 92 +3 107 92 56 +3 71 107 56 +3 71 56 19 +3 34 71 19 +3 511 539 503 +3 475 511 503 +3 475 503 467 +3 439 475 467 +3 439 467 431 +3 403 439 431 +3 403 431 395 +3 367 403 395 +3 367 395 359 +3 331 367 359 +3 331 359 179 +3 151 331 179 +3 151 179 143 +3 115 151 143 +3 115 143 107 +3 79 115 107 +3 79 107 71 +3 43 79 71 +3 43 71 34 +3 6 43 34 +3 519 511 475 +3 483 519 475 +3 483 475 439 +3 447 483 439 +3 447 439 403 +3 411 447 403 +3 411 403 367 +3 375 411 367 +3 375 367 331 +3 339 375 331 +3 339 331 151 +3 159 339 151 +3 159 151 115 +3 123 159 115 +3 123 115 79 +3 87 123 79 +3 87 79 43 +3 51 87 43 +3 51 43 6 +3 14 51 6 +3 531 519 483 +3 495 531 483 +3 495 483 447 +3 459 495 447 +3 459 447 411 +3 423 459 411 +3 423 411 375 +3 387 423 375 +3 387 375 339 +3 351 387 339 +3 351 339 159 +3 171 351 159 +3 171 159 123 +3 135 171 123 +3 135 123 87 +3 99 135 87 +3 99 87 51 +3 63 99 51 +3 63 51 14 +3 26 63 14 +3 532 531 495 +3 496 532 495 +3 496 495 459 +3 460 496 459 +3 460 459 423 +3 424 460 423 +3 424 423 387 +3 388 424 387 +3 388 387 351 +3 352 388 351 +3 352 351 171 +3 172 352 171 +3 172 171 135 +3 136 172 135 +3 136 135 99 +3 100 136 99 +3 100 99 63 +3 64 100 63 +3 64 63 26 +3 27 64 26 +3 520 532 496 +3 484 520 496 +3 484 496 460 +3 448 484 460 +3 448 460 424 +3 412 448 424 +3 412 424 388 +3 376 412 388 +3 376 388 352 +3 340 376 352 +3 340 352 172 +3 160 340 172 +3 160 172 136 +3 124 160 136 +3 124 136 100 +3 88 124 100 +3 88 100 64 +3 52 88 64 +3 52 64 27 +3 15 52 27 +3 512 520 484 +3 476 512 484 +3 476 484 448 +3 440 476 448 +3 440 448 412 +3 404 440 412 +3 404 412 376 +3 368 404 376 +3 368 376 340 +3 332 368 340 +3 332 340 160 +3 152 332 160 +3 152 160 124 +3 116 152 124 +3 116 124 88 +3 80 116 88 +3 80 88 52 +3 44 80 52 +3 44 52 15 +3 7 44 15 +3 540 512 476 +3 504 540 476 +3 504 476 440 +3 468 504 440 +3 468 440 404 +3 432 468 404 +3 432 404 368 +3 396 432 368 +3 396 368 332 +3 360 396 332 +3 360 332 152 +3 180 360 152 +3 180 152 116 +3 144 180 116 +3 144 116 80 +3 108 144 80 +3 108 80 44 +3 72 108 44 +3 72 44 7 +3 35 72 7 +3 521 540 504 +3 485 521 504 +3 485 504 468 +3 449 485 468 +3 449 468 432 +3 413 449 432 +3 413 432 396 +3 377 413 396 +3 377 396 360 +3 341 377 360 +3 341 360 180 +3 161 341 180 +3 161 180 144 +3 125 161 144 +3 125 144 108 +3 89 125 108 +3 89 108 72 +3 53 89 72 +3 53 72 35 +3 16 53 35 +CELL_DATA 972 +FIELD attributes 1 +zone 1 972 float +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 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 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 1 1 +1 1 diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_stirrer_baffles.vtk b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_stirrer_baffles.vtk new file mode 100644 index 000000000..ee2714128 --- /dev/null +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/constant/triSurface/zone_stirrer_baffles.vtk @@ -0,0 +1,265 @@ +# vtk DataFile Version 2.0 +sampleSurface +ASCII +DATASET POLYDATA +POINTS 127 double +0 0 0.08 +-0.0562916 0.0325 0.05 +0.0562916 -0.0325 0.05 +0.0562916 0.0325 0.05 +-0.0562916 -0.0325 0.05 +0 0.065 0.05 +0 -0.065 0.05 +-0.0562916 0.0325 0.08 +0.0562916 -0.0325 0.08 +0.0562916 0.0325 0.08 +-0.0562916 -0.0325 0.08 +0 0.065 0.08 +0 -0.065 0.08 +-0.0995929 0.0575 0.05 +0.0995929 -0.0575 0.05 +0.0995929 0.0575 0.05 +-0.0995929 -0.0575 0.05 +0 0.115 0.05 +0 -0.115 0.05 +-0.0562916 0.0325 0.11 +0.0562916 -0.0325 0.11 +0.0562916 0.0325 0.11 +-0.0562916 -0.0325 0.11 +0 0.065 0.11 +0 -0.065 0.11 +0.0866025 0.05 0.08 +0.05 0.0866025 0.08 +-0.05 0.0866025 0.08 +-0.0866025 0.05 0.08 +-0.0866025 -0.05 0.08 +-0.05 -0.0866025 0.08 +0.05 -0.0866025 0.08 +0.0866025 -0.05 0.08 +0.0766044 0.0642788 0.08 +0.0642788 0.0766044 0.08 +-0.0642788 0.0766044 0.08 +-0.0766044 0.0642788 0.08 +-0.0766044 -0.0642788 0.08 +-0.0642788 -0.0766044 0.08 +0.0642788 -0.0766044 0.08 +0.0766044 -0.0642788 0.08 +0.1 -2.44929e-17 0.08 +6.12323e-18 0.1 0.08 +-0.1 1.22465e-17 0.08 +-1.83697e-17 -0.1 0.08 +0.0984808 0.0173648 0.08 +0.0173648 0.0984808 0.08 +-0.0173648 0.0984808 0.08 +-0.0984808 0.0173648 0.08 +-0.0984808 -0.0173648 0.08 +-0.0173648 -0.0984808 0.08 +0.0173648 -0.0984808 0.08 +0.0984808 -0.0173648 0.08 +0.0939693 0.034202 0.08 +0.034202 0.0939693 0.08 +-0.034202 0.0939693 0.08 +-0.0939693 0.034202 0.08 +-0.0939693 -0.034202 0.08 +-0.034202 -0.0939693 0.08 +0.034202 -0.0939693 0.08 +0.0939693 -0.034202 0.08 +-0.0995929 0.0575 0.08 +0.0995929 -0.0575 0.08 +0.0995929 0.0575 0.08 +-0.0995929 -0.0575 0.08 +0 0.115 0.08 +0 -0.115 0.08 +-0.0995929 0.0575 0.11 +0.0995929 -0.0575 0.11 +0.0995929 0.0575 0.11 +-0.0995929 -0.0575 0.11 +0 0.115 0.11 +0 -0.115 0.11 +-0.142894 0.0825 0.05 +0.142894 -0.0825 0.05 +0.142894 0.0825 0.05 +-0.142894 -0.0825 0.05 +0 0.165 0.05 +0 -0.165 0.05 +-0.142894 0.0825 0.08 +0.142894 -0.0825 0.08 +0.142894 0.0825 0.08 +-0.142894 -0.0825 0.08 +0 0.165 0.08 +0 -0.165 0.08 +-0.142894 0.0825 0.11 +0.142894 -0.0825 0.11 +0.142894 0.0825 0.11 +-0.142894 -0.0825 0.11 +0 0.165 0.11 +0 -0.165 0.11 +-0.0265165 0.025 0.363483 +0.0265165 -0.025 0.363483 +-0.0265165 0.1 0.363483 +0.0265165 -0.1 0.363483 +0 0.025 0.39 +0 -0.025 0.39 +0 0.1 0.39 +0 -0.1 0.39 +-0.0265165 0.175 0.363483 +0.0265165 -0.175 0.363483 +0.0265165 0.025 0.416517 +-0.0265165 -0.025 0.416517 +0 0.175 0.39 +0 -0.175 0.39 +0.0265165 0.1 0.416517 +-0.0265165 -0.1 0.416517 +0.0265165 0.175 0.416517 +-0.0265165 -0.175 0.416517 +0.025 0.0265165 0.703484 +-0.025 -0.0265165 0.703484 +0.1 0.0265165 0.703484 +-0.1 -0.0265165 0.703484 +0.175 0.0265165 0.703484 +-0.175 -0.0265165 0.703484 +0.025 0 0.73 +-0.025 0 0.73 +0.1 0 0.73 +-0.1 0 0.73 +0.175 0 0.73 +-0.175 0 0.73 +0.025 -0.0265165 0.756516 +-0.025 0.0265165 0.756516 +0.1 -0.0265165 0.756516 +-0.1 0.0265165 0.756516 +0.175 -0.0265165 0.756516 +-0.175 0.0265165 0.756516 + +POLYGONS 116 464 +3 45 0 41 +3 53 0 45 +3 25 0 53 +3 33 0 25 +3 34 0 33 +3 26 0 34 +3 54 0 26 +3 46 0 54 +3 42 0 46 +3 47 0 42 +3 55 0 47 +3 27 0 55 +3 35 0 27 +3 36 0 35 +3 28 0 36 +3 56 0 28 +3 48 0 56 +3 43 0 48 +3 49 0 43 +3 57 0 49 +3 29 0 57 +3 37 0 29 +3 38 0 37 +3 30 0 38 +3 58 0 30 +3 50 0 58 +3 44 0 50 +3 51 0 44 +3 59 0 51 +3 31 0 59 +3 39 0 31 +3 40 0 39 +3 32 0 40 +3 60 0 32 +3 52 0 60 +3 41 0 52 +3 77 83 17 +3 83 65 17 +3 17 65 5 +3 65 11 5 +3 83 89 65 +3 89 71 65 +3 65 71 11 +3 71 23 11 +3 6 12 18 +3 12 66 18 +3 18 66 78 +3 66 84 78 +3 12 24 66 +3 24 72 66 +3 66 72 84 +3 72 90 84 +3 73 79 13 +3 79 61 13 +3 13 61 1 +3 61 7 1 +3 79 85 61 +3 85 67 61 +3 61 67 7 +3 67 19 7 +3 2 8 14 +3 8 62 14 +3 14 62 74 +3 62 80 74 +3 8 20 62 +3 20 68 62 +3 62 68 80 +3 68 86 80 +3 75 81 15 +3 81 63 15 +3 15 63 3 +3 63 9 3 +3 81 87 63 +3 87 69 63 +3 63 69 9 +3 69 21 9 +3 4 10 16 +3 10 64 16 +3 16 64 76 +3 64 82 76 +3 10 22 64 +3 22 70 64 +3 64 70 82 +3 70 88 82 +3 99 103 93 +3 103 97 93 +3 93 97 91 +3 97 95 91 +3 103 107 97 +3 107 105 97 +3 97 105 95 +3 105 101 95 +3 92 96 94 +3 96 98 94 +3 94 98 100 +3 98 104 100 +3 96 102 98 +3 102 106 98 +3 98 106 104 +3 106 108 104 +3 121 123 115 +3 123 117 115 +3 115 117 109 +3 117 111 109 +3 123 125 117 +3 125 119 117 +3 117 119 111 +3 119 113 111 +3 126 124 120 +3 124 118 120 +3 120 118 114 +3 118 112 114 +3 124 122 118 +3 122 116 118 +3 118 116 112 +3 116 110 112 +CELL_DATA 116 +FIELD attributes 1 +zone 1 116 float +0 0 0 0 0 0 0 0 0 0 +0 0 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 2 2 2 2 2 2 +2 2 3 3 3 3 3 3 3 3 +4 4 4 4 4 4 4 4 5 5 +5 5 5 5 5 5 6 6 6 6 +6 6 6 6 7 7 7 7 7 7 +7 7 8 8 8 8 8 8 8 8 +9 9 9 9 9 9 9 9 10 10 +10 10 10 10 10 10 diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict index db3a70619..2b43897dd 100644 --- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict +++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application foamyHexMesh; +application interFoam; startFrom startTime; @@ -23,26 +23,34 @@ startTime 0; stopAt endTime; -endTime 100; +endTime 5.0; -deltaT 1; +deltaT 1e-4; -writeControl timeStep; +writeControl adjustableRunTime; -writeInterval 100; +writeInterval 0.05; purgeWrite 0; writeFormat binary; -writePrecision 10; +writePrecision 6; writeCompression uncompressed; timeFormat general; -timePrecision 6; +timePrecision 10; runTimeModifiable yes; +adjustTimeStep yes; + +maxCo 1.5; + +maxAlphaCo 1; + +maxDeltaT 1; + // ************************************************************************* // diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T b/tutorials/mesh/foamyQuadMesh/OpenCFD/0/T similarity index 100% rename from tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/T rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0/T diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U b/tutorials/mesh/foamyQuadMesh/OpenCFD/0/U similarity index 100% rename from tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/U rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0/U diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p b/tutorials/mesh/foamyQuadMesh/OpenCFD/0/p similarity index 100% rename from tutorials/mesh/foamyQuadMesh/OpenCFD/0.orig/p rename to tutorials/mesh/foamyQuadMesh/OpenCFD/0/p diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean index ab8099c64..f4369c736 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allclean @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -rf constant/triSurface/*.eMesh > /dev/null 2>&1 -rm -rf 0 > /dev/null 2>&1 rm -rf MeshedSurface.obj > /dev/null 2>&1 cleanCase diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun index 45ed240d7..8bec0f1be 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun @@ -11,5 +11,4 @@ runApplication foamyQuadMesh -overwrite runApplication extrude2DMesh -overwrite polyMesh2D runApplication checkMesh -allGeometry -allTopology -constant -noZero - #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam index 955a30016..fa171f104 100755 --- a/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam +++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam @@ -5,11 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions cp system/controlDict.rhoCentralFoam system/controlDict -cp -r 0.orig 0 runApplication decomposePar runParallel rhoCentralFoam runApplication reconstructPar - #------------------------------------------------------------------------------