diff --git a/TODO b/TODO index 7cf51e0e2b..8770155fdf 100644 --- a/TODO +++ b/TODO @@ -88,8 +88,9 @@ OK - grep for size()/2 incompressible/simpleSRFFoam/mixer lagrangian/porousExplicitSourceReactingParcelFoam/filter lagrangian/reactingParcelFilmFoam/multipleBoxes - + +- have foamUpgradeCyclics split 'value' field - createBaffles - activeBaffleVelocity - kivaToFoam/readKivaGrid.H sorts cyclics (but in incorrect order?) diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/B b/tutorials/incompressible/channelFoam/channel395/0.org/B index 5d176ac6f6..afb2755491 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/B +++ b/tutorials/incompressible/channelFoam/channel395/0.org/B @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,45 +10,58 @@ FoamFile version 2.0; format ascii; class volTensorField; + location "1"; object B; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; -internalField uniform (0 0 0 0 0 0 0 0 0); +internalField uniform ( 0 0 0 0 0 0 0 0 0 ); boundaryField { - bottomWall + bottomWall { type zeroGradient; } - - topWall + topWall { type zeroGradient; } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/U b/tutorials/incompressible/channelFoam/channel395/0.org/U index c58accba92..77aea5e8f0 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/U +++ b/tutorials/incompressible/channelFoam/channel395/0.org/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,47 +10,60 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "1"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 1 -1 0 0 0 0]; +dimensions [ 0 1 -1 0 0 0 0 ]; -internalField uniform (0.1335 0 0); +internalField uniform ( 0.1335 0 0 ); boundaryField { - bottomWall + bottomWall { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } - - topWall + topWall { type fixedValue; - value uniform (0 0 0); + value uniform ( 0 0 0 ); } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/k b/tutorials/incompressible/channelFoam/channel395/0.org/k index 8fc33b69f1..c2e41f797b 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/k +++ b/tutorials/incompressible/channelFoam/channel395/0.org/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,47 +10,60 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "1"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0; boundaryField { - bottomWall + bottomWall { type fixedValue; value uniform 0; } - - topWall + topWall { type fixedValue; value uniform 0; } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs index 0ee721ac1a..0779277fe2 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs +++ b/tutorials/incompressible/channelFoam/channel395/0.org/nuSgs @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,45 +10,58 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "1"; object nuSgs; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [ 0 2 -1 0 0 0 0 ]; internalField uniform 0; boundaryField { - bottomWall + bottomWall { type zeroGradient; } - - topWall + topWall { type zeroGradient; } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda index a6d88adfbb..af18403bb5 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda +++ b/tutorials/incompressible/channelFoam/channel395/0.org/nuTilda @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,47 +10,60 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "1"; object nuTilda; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [ 0 2 -1 0 0 0 0 ]; internalField uniform 0; boundaryField { - bottomWall + bottomWall { type fixedValue; value uniform 0; } - - topWall + topWall { type fixedValue; value uniform 0; } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0.org/p b/tutorials/incompressible/channelFoam/channel395/0.org/p index 3dcd0ff881..4c9f41f7f4 100644 --- a/tutorials/incompressible/channelFoam/channel395/0.org/p +++ b/tutorials/incompressible/channelFoam/channel395/0.org/p @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: splitCyclic | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,45 +10,58 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "1"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 0; boundaryField { - bottomWall + bottomWall { type zeroGradient; } - - topWall + topWall { type zeroGradient; } - - sides1 + sides1_half0 { type cyclic; } - - sides2 + sides2_half0 { type cyclic; } - - inout1 + inout1_half0 { type cyclic; } - - inout2 + inout2_half0 + { + type cyclic; + } + sides2_half1 + { + type cyclic; + } + sides1_half1 + { + type cyclic; + } + inout1_half1 + { + type cyclic; + } + inout2_half1 { type cyclic; } } + // ************************************************************************* // diff --git a/tutorials/incompressible/channelFoam/channel395/0/B.gz b/tutorials/incompressible/channelFoam/channel395/0/B.gz deleted file mode 100644 index 8f0c76a0d0..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/B.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/0/U.gz b/tutorials/incompressible/channelFoam/channel395/0/U.gz deleted file mode 100644 index 8d760d6bf3..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/U.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/0/k.gz b/tutorials/incompressible/channelFoam/channel395/0/k.gz deleted file mode 100644 index 8764beb118..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/k.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz b/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz deleted file mode 100644 index b35b5e290b..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/nuSgs.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz b/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz deleted file mode 100644 index fce239f520..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/nuTilda.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/0/p.gz b/tutorials/incompressible/channelFoam/channel395/0/p.gz deleted file mode 100644 index e370a36497..0000000000 Binary files a/tutorials/incompressible/channelFoam/channel395/0/p.gz and /dev/null differ diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict index 9eec7155e5..57e0203eca 100644 --- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict +++ b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/blockMeshDict @@ -42,36 +42,70 @@ edges ( ); -patches +boundary ( - wall bottomWall - ( - (0 1 7 6) - ) - wall topWall - ( - (4 10 11 5) - ) - cyclic sides1 - ( - (0 2 3 1) - (6 7 9 8) - ) - cyclic sides2 - ( - (2 4 5 3) - (8 9 11 10) - ) - cyclic inout1 - ( - (1 3 9 7) - (0 6 8 2) - ) - cyclic inout2 - ( - (3 5 11 9) - (2 8 10 4) - ) + bottomWall + { + type wall; + faces ((0 1 7 6)); + } + topWall + { + type wall; + faces ((4 10 11 5)); + } + + sides1_half0 + { + type cyclic; + neighbourPatch sides1_half1; + faces ((0 2 3 1)); + } + sides1_half1 + { + type cyclic; + neighbourPatch sides1_half0; + faces ((6 7 9 8)); + } + + sides2_half0 + { + type cyclic; + neighbourPatch sides2_half1; + faces ((2 4 5 3)); + } + sides2_half1 + { + type cyclic; + neighbourPatch sides2_half0; + faces ((8 9 11 10)); + } + + inout1_half0 + { + type cyclic; + neighbourPatch inout1_half1; + faces ((1 3 9 7)); + } + inout1_half1 + { + type cyclic; + neighbourPatch inout1_half0; + faces ((0 6 8 2)); + } + + inout2_half0 + { + type cyclic; + neighbourPatch inout2_half1; + faces ((3 5 11 9)); + } + inout2_half1 + { + type cyclic; + neighbourPatch inout2_half0; + faces ((2 8 10 4)); + } ); mergePatchPairs diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary deleted file mode 100644 index 99406517bf..0000000000 --- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -6 -( - bottomWall - { - type wall; - nFaces 1200; - startFace 175300; - } - topWall - { - type wall; - nFaces 1200; - startFace 176500; - } - sides1 - { - type cyclic; - nFaces 2000; - startFace 177700; - featureCos 0.9; - } - sides2 - { - type cyclic; - nFaces 2000; - startFace 179700; - featureCos 0.9; - } - inout1 - { - type cyclic; - nFaces 1500; - startFace 181700; - featureCos 0.9; - } - inout2 - { - type cyclic; - nFaces 1500; - startFace 183200; - featureCos 0.9; - } -) - -// ************************************************************************* //