From 6bd5df7f41bcc8354f7fa40296a78baaee9c531c Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 29 Jul 2008 11:03:29 +0100 Subject: [PATCH 1/4] added comment for distributed running --- .../parallelProcessing/decomposePar/decomposeParDict | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict index c7317b464f..7ece22c5ae 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict +++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict @@ -58,4 +58,15 @@ manualCoeffs dataFile "decompositionData"; } + +//// Is the case distributred +//distributed yes; +//// Per slave (so nProcs-1 entries) the directory above the case. +//roots +//( +// "/tmp" +// "/tmp" +//); + + // ************************************************************************* // From d8638da06fba7c7519c5f0dbcbad407d2f96f98e Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 29 Jul 2008 11:50:18 +0100 Subject: [PATCH 2/4] set number of patches before changing faces --- .../utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C index 0335cf3abc..bcd1c5c9ce 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C @@ -275,6 +275,12 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m) patchIndices[patchI] = patchIndex(bm[patchI]); } + // Temporary: update number of allowable patches. This should be + // determined at the top - before adding anything. + meshMod_.setNumPatches(patchNames_.size()); + + + const faceZoneMesh& fz = m.faceZones(); labelList faceZoneIndices(fz.size()); From b4dd40f798ec8501dfe12d9fba849647a7b1e5c3 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 29 Jul 2008 18:25:43 +0100 Subject: [PATCH 3/4] extraneous files --- .../iglooWithFridges/constant/dynamicMeshDict | 52 ------------------- .../constant/transportProperties | 20 ------- .../motorBike/constant/dynamicMeshDict | 52 ------------------- .../motorBike/constant/transportProperties | 20 ------- 4 files changed, 144 deletions(-) delete mode 100644 tutorials/snappyHexMesh/iglooWithFridges/constant/dynamicMeshDict delete mode 100644 tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties delete mode 100644 tutorials/snappyHexMesh/motorBike/constant/dynamicMeshDict delete mode 100644 tutorials/snappyHexMesh/motorBike/constant/transportProperties diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/dynamicMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/constant/dynamicMeshDict deleted file mode 100644 index 20e80e0c87..0000000000 --- a/tutorials/snappyHexMesh/iglooWithFridges/constant/dynamicMeshDict +++ /dev/null @@ -1,52 +0,0 @@ -// The FOAM Project // File: motionProperties -/* - -------------------------------------------------------------------------------- - ========= | dictionary - \\ / | - \\ / | Name: motionProperties - \\ / | Family: FoamX configuration file - \\/ | - F ield | FOAM version: 2.1 - O peration | Product of Nabla Ltd. - A and | - M anipulation | Email: Enquiries@Nabla.co.uk -------------------------------------------------------------------------------- -*/ -// FoamX Case Dictionary. - -version 1.0; -format ascii; - -root "/home/warhol/chris/foam/chris2.1/run/Test"; -case "movingCone"; -instance "constant"; -local ""; - -class dictionary; -form dictionary; -object motionProperties; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//motionSolverLibs ("libfvMotionSolvers.so"); -solver laplacian; -//solver componentLaplacian x; - -twoDMotion no; - -diffusivity uniform; - -//motionPlaneNormal (0 0 1); -// -//movingSurface yes; -// -//twoFluids no; -// -//normalMotionDir no; -// -//motionURF 1.0; -// -//boundaryCorrection yes; - -// ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties b/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties deleted file mode 100644 index c61d913dc8..0000000000 --- a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -nu nu [0 2 -1 0 0 0 0] 0.01; - -// ************************************************************************* // diff --git a/tutorials/snappyHexMesh/motorBike/constant/dynamicMeshDict b/tutorials/snappyHexMesh/motorBike/constant/dynamicMeshDict deleted file mode 100644 index 20e80e0c87..0000000000 --- a/tutorials/snappyHexMesh/motorBike/constant/dynamicMeshDict +++ /dev/null @@ -1,52 +0,0 @@ -// The FOAM Project // File: motionProperties -/* - -------------------------------------------------------------------------------- - ========= | dictionary - \\ / | - \\ / | Name: motionProperties - \\ / | Family: FoamX configuration file - \\/ | - F ield | FOAM version: 2.1 - O peration | Product of Nabla Ltd. - A and | - M anipulation | Email: Enquiries@Nabla.co.uk -------------------------------------------------------------------------------- -*/ -// FoamX Case Dictionary. - -version 1.0; -format ascii; - -root "/home/warhol/chris/foam/chris2.1/run/Test"; -case "movingCone"; -instance "constant"; -local ""; - -class dictionary; -form dictionary; -object motionProperties; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//motionSolverLibs ("libfvMotionSolvers.so"); -solver laplacian; -//solver componentLaplacian x; - -twoDMotion no; - -diffusivity uniform; - -//motionPlaneNormal (0 0 1); -// -//movingSurface yes; -// -//twoFluids no; -// -//normalMotionDir no; -// -//motionURF 1.0; -// -//boundaryCorrection yes; - -// ************************************************************************* // diff --git a/tutorials/snappyHexMesh/motorBike/constant/transportProperties b/tutorials/snappyHexMesh/motorBike/constant/transportProperties deleted file mode 100644 index c61d913dc8..0000000000 --- a/tutorials/snappyHexMesh/motorBike/constant/transportProperties +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object transportProperties; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -nu nu [0 2 -1 0 0 0 0] 0.01; - -// ************************************************************************* // From 700ba91ec7caf0959be8e49d1e5486bab0511814 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 29 Jul 2008 18:49:49 +0100 Subject: [PATCH 4/4] changed header --- .../iglooWithFridges/system/decomposeParDict | 40 +++++-------------- .../motorBike/system/decomposeParDict | 40 +++++-------------- 2 files changed, 22 insertions(+), 58 deletions(-) diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict b/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict index 3b4a5b205d..25b7e5c29b 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict +++ b/tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict @@ -1,37 +1,19 @@ -// The FOAM Project // File: decomposeParDict -/* -------------------------------------------------------------------------------- - ========= | dictionary - \\ / | - \\ / | Name: decomposeParDict - \\ / | Family: FoamX configuration file - \\/ | - F ield | FOAM version: 2.1 - O peration | Product of Nabla Ltd. - A and | - M anipulation | Email: Enquiries@Nabla.co.uk -------------------------------------------------------------------------------- -*/ -// FoamX Case Dictionary. - +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam"; - case "cavity"; - instance "system"; - local ""; - - class dictionary; - object decomposeParDict; + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -arguments "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam" "cavity"; - numberOfSubdomains 6; method hierarchical; diff --git a/tutorials/snappyHexMesh/motorBike/system/decomposeParDict b/tutorials/snappyHexMesh/motorBike/system/decomposeParDict index 3b4a5b205d..25b7e5c29b 100644 --- a/tutorials/snappyHexMesh/motorBike/system/decomposeParDict +++ b/tutorials/snappyHexMesh/motorBike/system/decomposeParDict @@ -1,37 +1,19 @@ -// The FOAM Project // File: decomposeParDict -/* -------------------------------------------------------------------------------- - ========= | dictionary - \\ / | - \\ / | Name: decomposeParDict - \\ / | Family: FoamX configuration file - \\/ | - F ield | FOAM version: 2.1 - O peration | Product of Nabla Ltd. - A and | - M anipulation | Email: Enquiries@Nabla.co.uk -------------------------------------------------------------------------------- -*/ -// FoamX Case Dictionary. - +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - - root "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam"; - case "cavity"; - instance "system"; - local ""; - - class dictionary; - object decomposeParDict; + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -arguments "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam" "cavity"; - numberOfSubdomains 6; method hierarchical;