From 2fa8e5fdf351cc51480fee28c7a877ce1aac0caf Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 19 Mar 2021 18:41:09 +0000 Subject: [PATCH] TUT: discreteMethods: cleanup tutorials --- .../freeSpacePeriodic/0.orig/boundaryT | 30 +++++++++++ .../freeSpacePeriodic/0.orig/boundaryU | 30 +++++++++++ .../freeSpacePeriodic/0.orig/dsmcRhoN | 30 +++++++++++ .../dsmcFoam/freeSpacePeriodic/0.orig/fD | 30 +++++++++++ .../dsmcFoam/freeSpacePeriodic/0.orig/iDof | 30 +++++++++++ .../freeSpacePeriodic/0.orig/internalE | 30 +++++++++++ .../freeSpacePeriodic/0.orig/linearKE | 30 +++++++++++ .../freeSpacePeriodic/0.orig/momentum | 30 +++++++++++ .../freeSpacePeriodic/0.orig/q} | 17 ++++--- .../dsmcFoam/freeSpacePeriodic/0.orig/rhoM | 30 +++++++++++ .../dsmcFoam/freeSpacePeriodic/0.orig/rhoN | 30 +++++++++++ .../dsmcFoam/freeSpacePeriodic/0/boundaryT | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/boundaryU | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/dsmcRhoN | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/fD | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/iDof | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/internalE | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/linearKE | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/momentum | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/q | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/rhoM | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/0/rhoN | 51 ------------------- .../dsmcFoam/freeSpacePeriodic/Allclean | 4 +- .../dsmcFoam/freeSpacePeriodic/Allrun | 10 +++- .../freeSpacePeriodic/constant/dsmcProperties | 1 - .../freeSpacePeriodic/system/blockMeshDict | 5 -- .../freeSpacePeriodic/system/controlDict | 3 +- .../system/dsmcInitialiseDict | 1 - .../freeSpacePeriodic/system/fvSchemes | 2 +- .../freeSpacePeriodic/system/fvSolution | 2 +- .../freeSpaceStream/{0 => 0.orig}/boundaryT | 1 + .../freeSpaceStream/{0 => 0.orig}/boundaryU | 1 + .../freeSpaceStream/{0 => 0.orig}/dsmcRhoN | 1 + .../dsmcFoam/freeSpaceStream/{0 => 0.orig}/fD | 1 + .../freeSpaceStream/{0 => 0.orig}/iDof | 1 + .../freeSpaceStream/{0 => 0.orig}/internalE | 1 + .../freeSpaceStream/{0 => 0.orig}/linearKE | 1 + .../freeSpaceStream/{0 => 0.orig}/momentum | 1 + .../dsmcFoam/freeSpaceStream/{0 => 0.orig}/q | 1 + .../freeSpaceStream/{0 => 0.orig}/rhoM | 1 + .../freeSpaceStream/{0 => 0.orig}/rhoN | 1 + .../dsmcFoam/freeSpaceStream/Allclean | 4 +- .../dsmcFoam/freeSpaceStream/Allrun | 10 +++- .../freeSpaceStream/constant/dsmcProperties | 1 - .../freeSpaceStream/system/blockMeshDict | 5 -- .../freeSpaceStream/system/controlDict | 3 +- .../freeSpaceStream/system/dsmcInitialiseDict | 1 - .../dsmcFoam/freeSpaceStream/system/fvSchemes | 2 +- .../freeSpaceStream/system/fvSolution | 2 +- .../supersonicCorner/{0 => 0.orig}/boundaryT | 1 + .../supersonicCorner/{0 => 0.orig}/boundaryU | 1 + .../supersonicCorner/{0 => 0.orig}/dsmcRhoN | 1 + .../supersonicCorner/{0 => 0.orig}/fD | 1 + .../supersonicCorner/{0 => 0.orig}/iDof | 2 +- .../supersonicCorner/{0 => 0.orig}/internalE | 1 + .../supersonicCorner/{0 => 0.orig}/linearKE | 1 + .../supersonicCorner/{0 => 0.orig}/momentum | 2 +- .../dsmcFoam/supersonicCorner/{0 => 0.orig}/q | 2 +- .../supersonicCorner/{0 => 0.orig}/rhoM | 1 + .../supersonicCorner/{0 => 0.orig}/rhoN | 1 + .../dsmcFoam/supersonicCorner/Allclean | 4 +- .../dsmcFoam/supersonicCorner/Allrun | 6 +++ .../supersonicCorner/constant/dsmcProperties | 2 +- .../supersonicCorner/system/blockMeshDict | 4 -- .../supersonicCorner/system/controlDict | 2 +- .../supersonicCorner/system/decomposeParDict | 1 + .../system/dsmcInitialiseDict | 1 - .../supersonicCorner/system/fvSchemes | 2 +- .../supersonicCorner/system/fvSolution | 2 +- .../wedge15Ma5/{0 => 0.orig}/boundaryT | 1 + .../wedge15Ma5/{0 => 0.orig}/boundaryU | 1 + .../wedge15Ma5/{0 => 0.orig}/dsmcRhoN | 1 + .../dsmcFoam/wedge15Ma5/{0 => 0.orig}/fD | 1 + .../dsmcFoam/wedge15Ma5/{0 => 0.orig}/iDof | 1 + .../wedge15Ma5/{0 => 0.orig}/internalE | 1 + .../wedge15Ma5/{0 => 0.orig}/linearKE | 1 + .../wedge15Ma5/{0 => 0.orig}/momentum | 1 + .../dsmcFoam/wedge15Ma5/{0 => 0.orig}/q | 1 + .../dsmcFoam/wedge15Ma5/{0 => 0.orig}/rhoM | 1 + .../dsmcFoam/wedge15Ma5/{0 => 0.orig}/rhoN | 1 + .../dsmcFoam/wedge15Ma5/Allclean | 4 +- .../dsmcFoam/wedge15Ma5/Allrun | 6 +++ .../wedge15Ma5/constant/dsmcProperties | 1 - .../dsmcFoam/wedge15Ma5/system/blockMeshDict | 3 -- .../dsmcFoam/wedge15Ma5/system/controlDict | 2 +- .../wedge15Ma5/system/decomposeParDict | 1 + .../wedge15Ma5/system/dsmcInitialiseDict | 1 - .../dsmcFoam/wedge15Ma5/system/fvSchemes | 2 +- .../dsmcFoam/wedge15Ma5/system/fvSolution | 2 +- .../0.orig/U} | 16 +++--- .../mdEquilibrationFoam/periodicCubeArgon/0/U | 51 ------------------- .../periodicCubeArgon/Allclean | 3 +- .../periodicCubeArgon/Allrun | 4 ++ .../constant/moleculeProperties | 2 +- .../periodicCubeArgon/system/blockMeshDict | 1 - .../periodicCubeArgon/system/controlDict | 1 + .../periodicCubeArgon/system/fvSchemes | 2 +- .../periodicCubeArgon/system/fvSolution | 2 +- .../system/mdEquilibrationDict | 1 + .../periodicCubeArgon/system/mdInitialiseDict | 1 + .../periodicCubeWater/0.orig/U | 30 +++++++++++ .../mdEquilibrationFoam/periodicCubeWater/0/U | 51 ------------------- .../periodicCubeWater/Allclean | 3 +- .../periodicCubeWater/Allrun | 4 ++ .../constant/moleculeProperties | 2 +- .../periodicCubeWater/system/blockMeshDict | 1 - .../periodicCubeWater/system/controlDict | 1 + .../periodicCubeWater/system/fvSchemes | 2 +- .../periodicCubeWater/system/fvSolution | 2 +- .../system/mdEquilibrationDict | 1 + .../periodicCubeWater/system/mdInitialiseDict | 2 +- .../mdFoam/nanoNozzle/{0 => 0.orig}/U | 6 +++ .../mdFoam/nanoNozzle/Allclean | 3 +- .../mdFoam/nanoNozzle/Allrun | 4 ++ .../nanoNozzle/constant/moleculeProperties | 2 +- .../mdFoam/nanoNozzle/system/blockMeshDict | 1 + .../mdFoam/nanoNozzle/system/controlDict | 1 + .../mdFoam/nanoNozzle/system/decomposeParDict | 7 +-- .../mdFoam/nanoNozzle/system/fvSchemes | 2 +- .../mdFoam/nanoNozzle/system/fvSolution | 2 +- .../nanoNozzle/system/mdEquilibrationDict | 1 + .../mdFoam/nanoNozzle/system/mdInitialiseDict | 2 +- 122 files changed, 474 insertions(+), 756 deletions(-) create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum rename tutorials/discreteMethods/{molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict => dsmcFoam/freeSpacePeriodic/0.orig/q} (81%) create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM delete mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/boundaryT (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/boundaryU (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/dsmcRhoN (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/fD (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/iDof (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/internalE (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/linearKE (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/momentum (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/q (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/rhoM (99%) rename tutorials/discreteMethods/dsmcFoam/freeSpaceStream/{0 => 0.orig}/rhoN (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/boundaryT (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/boundaryU (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/dsmcRhoN (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/fD (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/iDof (100%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/internalE (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/linearKE (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/momentum (100%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/q (100%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/rhoM (99%) rename tutorials/discreteMethods/dsmcFoam/supersonicCorner/{0 => 0.orig}/rhoN (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/boundaryT (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/boundaryU (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/dsmcRhoN (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/fD (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/iDof (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/internalE (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/linearKE (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/momentum (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/q (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/rhoM (99%) rename tutorials/discreteMethods/dsmcFoam/wedge15Ma5/{0 => 0.orig}/rhoN (99%) rename tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/{periodicCubeWater/system/decomposeParDict => periodicCubeArgon/0.orig/U} (80%) delete mode 100644 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U create mode 100644 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U delete mode 100644 tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U rename tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/{0 => 0.orig}/U (99%) diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT new file mode 100644 index 0000000000..04ca467742 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryT @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object boundaryT; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU new file mode 100644 index 0000000000..6e0f17c580 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/boundaryU @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object boundaryU; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN new file mode 100644 index 0000000000..4d93a4347e --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/dsmcRhoN @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object dsmcRhoN; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 -3 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD new file mode 100644 index 0000000000..0f6b5165ad --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/fD @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object fD; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof new file mode 100644 index 0000000000..1352b8e189 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/iDof @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object iDof; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 -3 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE new file mode 100644 index 0000000000..86fddfd832 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/internalE @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object internalE; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE new file mode 100644 index 0000000000..167e65f8b4 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/linearKE @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object linearKE; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum new file mode 100644 index 0000000000..017d425f69 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/momentum @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object momentum; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -2 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q similarity index 81% rename from tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q index a358e4dd14..7afb21e46c 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/decomposeParDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/q @@ -9,19 +9,22 @@ FoamFile { version 2.0; format ascii; - class dictionary; - object decomposeParDict; + class volScalarField; + object q; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -numberOfSubdomains 2; +dimensions [1 0 -3 0 0 0 0]; -method simple; +internalField uniform 0; -coeffs +boundaryField { - n (2 1 1); + ".*" + { + type cyclic; + } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM new file mode 100644 index 0000000000..6571b7b36f --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoM @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object rhoM; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN new file mode 100644 index 0000000000..af4cebe71e --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0.orig/rhoN @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object rhoN; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 -3 0 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT deleted file mode 100644 index ad87fa8548..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryT +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object boundaryT; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU deleted file mode 100644 index baad5ef004..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/boundaryU +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object boundaryU; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN deleted file mode 100644 index edce07f3bb..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/dsmcRhoN +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object dsmcRhoN; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 -3 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD deleted file mode 100644 index 86470b5b72..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/fD +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object fD; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof deleted file mode 100644 index a8416bbdfe..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/iDof +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object iDof; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 -3 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE deleted file mode 100644 index d6f80c2b9a..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/internalE +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object internalE; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE deleted file mode 100644 index b34303ecf9..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/linearKE +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object linearKE; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum deleted file mode 100644 index f7908e3cbe..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/momentum +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object momentum; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -2 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q deleted file mode 100644 index 8414545d02..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/q +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object q; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 0 -3 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM deleted file mode 100644 index 3f5dca3a22..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoM +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object rhoM; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -3 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN deleted file mode 100644 index 29df43e31f..0000000000 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/rhoN +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object rhoN; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 -3 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - xPeriodic_half0 - { - type cyclic; - } - yPeriodic_half0 - { - type cyclic; - } - zPeriodic_half0 - { - type cyclic; - } - yPeriodic_half1 - { - type cyclic; - } - zPeriodic_half1 - { - type cyclic; - } - xPeriodic_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean index be79872792..fb1f384730 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean @@ -3,8 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase - -rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform +cleanCase0 #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun index e3a5f21d92..d73c47d50d 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun @@ -3,8 +3,16 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication dsmcInitialise -runApplication $(getApplication) + +runApplication decomposePar + +runParallel $(getApplication) + +runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties index 8f5ab0e4e3..843e2dc59a 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/constant/dsmcProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dsmcProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict index 093172f243..9b8e684381 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/blockMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // scale 0.01; @@ -79,9 +78,5 @@ boundary } ); -mergePatchPairs -( -); - // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict index 71c20f1dfb..adacf089a5 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -113,6 +112,7 @@ functions } ); } + dsmcFields1 { type dsmcFields; @@ -121,4 +121,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict index 12622a11c7..a40b92cfb5 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/dsmcInitialiseDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object dsmcInitialiseDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT index a9c877fb02..ae69d84cfe 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryT +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryT @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU index 617b6f855a..2185cc49f5 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/boundaryU +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/boundaryU @@ -39,4 +39,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN index 9aebde84a5..6af0b9bf4c 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/dsmcRhoN +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/dsmcRhoN @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD index 965d7f28a2..220393f123 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/fD +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/fD @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof index 6190a0b54a..f9ea39e607 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/iDof +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/iDof @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE index 61ef6b6393..a676563ec7 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/internalE +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/internalE @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE index 88d32bb4b6..93e26a5fff 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/linearKE +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/linearKE @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum index 9e5cc1c90d..72fb2e461e 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/momentum +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/momentum @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q index d4bbc401a4..c31dee712f 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/q +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/q @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM index fe088e6d79..0c48e0f44b 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoM +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoM @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN rename to tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN index 6908f41ce5..9159ddbc86 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/rhoN +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0.orig/rhoN @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean index be79872792..fb1f384730 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean @@ -3,8 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase - -rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform +cleanCase0 #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun index e3a5f21d92..0581bacdfd 100755 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun @@ -3,8 +3,16 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication dsmcInitialise -runApplication $(getApplication) + +runParallel redistributePar -decompose -overwrite -withZero + +runParallel $(getApplication) + +runApplication reconstructPar #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties index 1103901d9b..24824c5560 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/constant/dsmcProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dsmcProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict index 625503a636..4fd6da8caf 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/blockMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // scale 0.01; @@ -65,10 +64,6 @@ boundary (0 3 2 1) ); } -) - -mergePatchPairs -( ); diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict index 1ed7028fc1..ae0490daf1 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -114,6 +113,7 @@ functions } ); } + dsmcFields1 { type dsmcFields; @@ -122,4 +122,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict index a05363a665..4e5d938f8e 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/dsmcInitialiseDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object dsmcInitialiseDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT index 8e7b5f069e..c167351bc6 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryT +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryT @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU index 47f8d891d0..10fd1fe8c0 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/boundaryU +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/boundaryU @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN index 2a0bd27c5c..fecadd780b 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/dsmcRhoN +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/dsmcRhoN @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD index 977c720ee9..da791bc468 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/fD +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/fD @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof similarity index 100% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof index 776597745f..0133ff1175 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/iDof +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/iDof @@ -35,7 +35,7 @@ boundaryField type calculated; value uniform 0; } - } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE index 7a41687da7..07f876a5a9 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/internalE +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/internalE @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE index 6c8fe6f05e..8ee5c41402 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/linearKE +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/linearKE @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum similarity index 100% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum index 364c9dc125..8472607ca7 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/momentum +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/momentum @@ -35,7 +35,7 @@ boundaryField type calculated; value uniform (0 0 0); } - } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q similarity index 100% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q index 79cf663450..88a9432e2f 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/q +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/q @@ -24,7 +24,6 @@ boundaryField { type calculated; value uniform 0; - } "entrance.*" @@ -39,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM index 5c30897fd9..09ed56a5fb 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoM +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoM @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN rename to tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN index da91688eb0..f4af2f441d 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0/rhoN +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/0.orig/rhoN @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean index be79872792..fb1f384730 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean @@ -3,8 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase - -rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform +cleanCase0 #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun index fec6332440..135da2aee1 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun @@ -3,10 +3,16 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication decomposePar + runParallel dsmcInitialise + runParallel $(getApplication) + runApplication reconstructPar -noLagrangian #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties index f7f36e365b..238a0a1ea2 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/constant/dsmcProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dsmcProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,4 +68,5 @@ moleculeProperties } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict index d245b70b3c..b3946f2ada 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/blockMeshDict @@ -83,10 +83,6 @@ boundary (1 2 9 8) ); } -) - -mergePatchPairs -( ); diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict index b27a9eee1e..3860ff8a9f 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -122,4 +121,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict index 59f62a04b7..1f7326658e 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/dsmcInitialiseDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object dsmcInitialiseDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT index 19d6e39120..b5856af5c7 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryT +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryT @@ -38,4 +38,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU index df5115f4e6..2b690c11fa 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/boundaryU +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/boundaryU @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN index 73216a456a..274c720fea 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/dsmcRhoN +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/dsmcRhoN @@ -36,4 +36,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD index 152d1e4ea5..bd55411879 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/fD +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/fD @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof index d6af05ee6e..b17605e236 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/iDof +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/iDof @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE index 25787ec171..15edded71d 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/internalE +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/internalE @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE index b2f481ca30..26854c4b44 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/linearKE +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/linearKE @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum index 8e38800c9e..ba5b89161d 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/momentum +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/momentum @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q index e31ab71941..3894bcda44 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/q +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/q @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM index 28adbddf53..b5bb70b973 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoM +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoM @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN similarity index 99% rename from tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN rename to tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN index e921eaa06f..5fa2e6ea97 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0/rhoN +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/0.orig/rhoN @@ -37,4 +37,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean index be79872792..fb1f384730 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean @@ -3,8 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase - -rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform +cleanCase0 #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun index fec6332440..135da2aee1 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun @@ -3,10 +3,16 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication decomposePar + runParallel dsmcInitialise + runParallel $(getApplication) + runApplication reconstructPar -noLagrangian #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties index a99049b31a..11b9b4665c 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/constant/dsmcProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object dsmcProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict index 2b49b923f9..8543f248cf 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/blockMeshDict @@ -79,8 +79,5 @@ boundary } ); -mergePatchPairs -( -); // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict index e0f604b0c4..38887bec0f 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -134,4 +133,5 @@ functions } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict index 33631badb5..d96083400d 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/decomposeParDict @@ -23,4 +23,5 @@ coeffs n (2 2 1); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict index 31cb3b86d9..f5a4fb49a6 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/dsmcInitialiseDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object dsmcInitialiseDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U similarity index 80% rename from tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict rename to tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U index bfb4d58728..4d03650cff 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/decomposeParDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0.orig/U @@ -9,19 +9,21 @@ FoamFile { version 2.0; format ascii; - class dictionary; - object decomposeParDict; + class volVectorField; + object U; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -numberOfSubdomains 4; +dimensions [0 1 -1 0 0 0 0]; -method simple; +internalField uniform (0 0 0); -coeffs +boundaryField { - n (2 2 1); + ".*" + { + type cyclic; + } } diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U deleted file mode 100644 index c67f84aba8..0000000000 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/0/U +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - periodicX_half0 - { - type cyclic; - } - periodicY_half0 - { - type cyclic; - } - periodicZ_half0 - { - type cyclic; - } - periodicY_half1 - { - type cyclic; - } - periodicZ_half1 - { - type cyclic; - } - periodicX_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean index 9ee80cc641..630572921b 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean @@ -3,9 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase +cleanCase0 -rm -rf 0/lagrangian 0/uniform rm -f Ar-Ar rm -f electrostatic rm -f constant/idList diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun index b506967a8e..eff9b002a2 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun @@ -3,8 +3,12 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication mdInitialise + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties index daa0484970..1105f76352 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/constant/moleculeProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object moleculeProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,4 +32,5 @@ Ar ); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict index 93ebc150cf..fc99c1ebf6 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/blockMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // scale 2.462491658e-9; diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict index bf2ffbeb57..25669c0cd5 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict @@ -46,4 +46,5 @@ runTimeModifiable true; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict index ddea024b3c..40bc120c5d 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdEquilibrationDict @@ -16,4 +16,5 @@ FoamFile targetTemperature 300.0; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict index 1f9ec54d34..27f93975d9 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/mdInitialiseDict @@ -33,4 +33,5 @@ liquid latticeCellShape (1 1 1); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U new file mode 100644 index 0000000000..4d03650cff --- /dev/null +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0.orig/U @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: v2012 | +| \\ / A nd | Website: www.openfoam.com | +| \\/ 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 +{ + ".*" + { + type cyclic; + } +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U deleted file mode 100644 index c67f84aba8..0000000000 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/0/U +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: v2012 | -| \\ / A nd | Website: www.openfoam.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - periodicX_half0 - { - type cyclic; - } - periodicY_half0 - { - type cyclic; - } - periodicZ_half0 - { - type cyclic; - } - periodicY_half1 - { - type cyclic; - } - periodicZ_half1 - { - type cyclic; - } - periodicX_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean index 6532fedd14..af1dac2eb7 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean @@ -3,9 +3,8 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase +cleanCase0 -rm -rf 0/lagrangian 0/uniform rm -f O-O rm -f electrostatic rm -f constant/idList diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun index b506967a8e..eff9b002a2 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun @@ -3,8 +3,12 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication mdInitialise + runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties index 5434875cd2..385afdc308 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/constant/moleculeProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object moleculeProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,4 +68,5 @@ water2 ); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict index 5e7e8682cc..4276398b71 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/blockMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object blockMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // scale 2.10840e-9; diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict index 41b2452b1a..44d9c368bb 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict @@ -46,4 +46,5 @@ runTimeModifiable true; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict index 4c17a1e147..7af31c80b1 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdEquilibrationDict @@ -16,4 +16,5 @@ FoamFile targetTemperature 298; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict index 2fb1bed86c..1d509a6f7d 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/mdInitialiseDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object mdInitialiseDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Euler angles, expressed in degrees as phi, theta, psi, see @@ -43,4 +42,5 @@ liquid latticeCellShape (1 1 1); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U similarity index 99% rename from tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U rename to tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U index 885e4997ad..c19b00173c 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0/U +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/0.orig/U @@ -24,26 +24,32 @@ boundaryField { type noSlip; } + sectionCEnd { type noSlip; } + front { type noSlip; } + back { type noSlip; } + top { type noSlip; } + bottom { type noSlip; } } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean index 4828f169d4..fb1f384730 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean @@ -3,7 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions # Tutorial clean functions #------------------------------------------------------------------------------ -cleanCase -rm -rf processor[0-9] +cleanCase0 #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun index fd91352cce..98812b1ed7 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun @@ -3,10 +3,14 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +restore0Dir + runApplication blockMesh + runApplication decomposePar runParallel mdInitialise + runParallel $(getApplication) runApplication reconstructPar diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties index 8c58e2c461..2b6d24697d 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/constant/moleculeProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object moleculeProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -42,4 +41,5 @@ water ); } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict index 05c153110c..abfb3b1290 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/blockMeshDict @@ -133,4 +133,5 @@ mergePatchPairs ( ); + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict index d48ef15177..83eaba9673 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict @@ -46,4 +46,5 @@ runTimeModifiable true; adjustTimeStep no; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict index 43eaae2374..79d391fa3e 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/decomposeParDict @@ -12,16 +12,11 @@ FoamFile class dictionary; object decomposeParDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // numberOfSubdomains 4; -method scotch; +method scotch; -coeffs -{ - n (2 2 1); -} // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes index ac52d4b345..815aa533f8 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSchemes @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,4 +44,5 @@ snGradSchemes default none; } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution index 878c84cc9f..00ae95d693 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/fvSolution @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,4 +18,5 @@ solvers { } + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict index 4c17a1e147..7af31c80b1 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdEquilibrationDict @@ -16,4 +16,5 @@ FoamFile targetTemperature 298; + // ************************************************************************* // diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict index c4055b3c72..b948588a06 100644 --- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict +++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/mdInitialiseDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object mdInitialiseDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Euler angles, expressed in degrees as phi, theta, psi, see @@ -75,4 +74,5 @@ sectionC latticeCellShape (1 1 1); } + // ************************************************************************* //