From a31223a29b6280a43949cb0b09a3cc4d974e6e72 Mon Sep 17 00:00:00 2001 From: graham Date: Tue, 8 Jul 2008 14:09:00 +0100 Subject: [PATCH 01/11] Changed property averaging report to remove r.f --- .../molecularDynamics/molecule/mdTools/temperatureAndPressure.H | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H index 8d64460d55..24d6fb88e5 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H @@ -86,8 +86,6 @@ if (runTime.outputTime()) << " m/s" << nl << "Average temperature = " << averageTemperature << " K" << nl - << "accumulatedTotalrDotfSum = " - << accumulatedTotalrDotfSum << nl << "Average pressure = " << averagePressure << " N/m^2" << nl << "----------------------------------------" << endl; From f400fb2943fefae385cc8b1f31a9ef22be9f043d Mon Sep 17 00:00:00 2001 From: graham Date: Tue, 8 Jul 2008 14:09:00 +0100 Subject: [PATCH 02/11] Changed property averaging report to remove r.f --- .../molecularDynamics/molecule/mdTools/temperatureAndPressure.H | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H index 8d64460d55..24d6fb88e5 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H @@ -86,8 +86,6 @@ if (runTime.outputTime()) << " m/s" << nl << "Average temperature = " << averageTemperature << " K" << nl - << "accumulatedTotalrDotfSum = " - << accumulatedTotalrDotfSum << nl << "Average pressure = " << averagePressure << " N/m^2" << nl << "----------------------------------------" << endl; From f22d251d60c184f0e6c0bdd80b49ef5151d62af8 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 14 Jul 2008 10:11:01 +0200 Subject: [PATCH 03/11] added foamCopySettings script * copies case contents without the polyMesh --- bin/foamCopySettings | 100 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100755 bin/foamCopySettings diff --git a/bin/foamCopySettings b/bin/foamCopySettings new file mode 100755 index 0000000000..22c7a6b32a --- /dev/null +++ b/bin/foamCopySettings @@ -0,0 +1,100 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. +# \\/ M anipulation | +#------------------------------------------------------------------------------- +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# Script +# foamCopySettings +# +# Description +# Usage: foamCopySettings srcDir dstDir +# +# Copy OpenFOAM settings from one case to another, without copying +# the mesh or results +# - requires rsync +#------------------------------------------------------------------------------ +if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ] +then + cat <&2 +Usage: ${0##*/} srcDir dstDir + + Copy OpenFOAM settings from one case to another, without copying + the mesh or results. + - requires rsync + +USAGE + exit 1 +fi + +srcDir=$1 +dstDir=$2 + +if [ ! -d $srcDir ] +then + echo "Error: directory '$srcDir' does not exist" + exit 1 +fi + +if [ ! -d $dstDir ] +then + echo "Error: directory '$dstDir' does not exist" + exit 1 +fi + +# check that the srcDir looks okay +for i in $srcDir/constant $srcDir/system +do + if [ ! -d $i ] + then + echo "Error: no '${i##*/}' directory in '$srcDir'" + echo " does not appear to be an OpenFOAM case" + exit 1 + fi +done + +# files and directories to copy +# avoid processor directories +fileList=$(find -H $srcDir -mindepth 1 -maxdepth 1 -not -name "processor*") + +# TODO: +# - verify that it works with multiple mesh regions +# - special treatment for starting with negative crank angles + +for i in $fileList +do + name="${i##*/}" + # skip numerical (results) directories (except 0) + # and things that look like queuing system output + case "$name" in + [1-9] | [0-9]?* | foam.[eo][1-9]*) + echo "$i [skipped]" + continue + ;; + *) + echo "$i -> $dstDir/$name" + rsync --exclude polyMesh --exclude "processor*" -a $i $dstDir + ;; + esac +done + +# --------------------------------------------------------------- end-of-file From fbac898f53ed9a4ad34c98f1a271f8578cd18358 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 14 Jul 2008 10:12:20 +0200 Subject: [PATCH 04/11] updated foamClearPolyMesh * now removes the same files as Foam::polyMesh::removeFiles() * accepts -case option --- bin/foamClearPolyMesh | 94 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 10 deletions(-) diff --git a/bin/foamClearPolyMesh b/bin/foamClearPolyMesh index f54f148569..07531f68bf 100755 --- a/bin/foamClearPolyMesh +++ b/bin/foamClearPolyMesh @@ -27,20 +27,94 @@ # foamClearPolyMesh # # Description -# +# Remove the contents of the constant/polyMesh directory +# as per the Foam::polyMesh::removeFiles() method. +# #------------------------------------------------------------------------------ +usage() { + while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done + cat <&2 -if [ -d constant/polyMesh ]; then - echo "there is constant/polyMesh"; - cd constant/polyMesh +usage: ${0##*/} [-case dir] -elif [ -d polyMesh ]; then - echo "there is polyMesh"; - cd polyMesh -else - echo "in polyMesh directory"; + Remove the contents of the constant/polyMesh directory + as per the Foam::polyMesh::removeFiles() method. + +USAGE + exit 1 +} + +unset caseDir +unset meshDir + +# parse options +if [ "$#" -gt 0 ]; then + case "$1" in + -h | -help) + usage + ;; + -case) + shift + caseDir=$1 + [ "$#" -ge 1 ] || usage "'-case' option requires an argument" + cd "$caseDir" 2>/dev/null || usage "directory does not exist: '$caseDir'" + meshDir="constant/polyMesh" + ;; + *) + usage "unknown option/argument: '$*'" + ;; + esac fi -rm -f pointFaces pointEdges pointCells faceEdges edges edgeFaces edgeCells cellEdges cellCells owner neighbour losort faceCentres faceAreas cellVolumes cellCentres +# meshDir is only set if -case was specified: insist upon 'constant/polyMesh' +if [ -n "$meshDir" ] +then + if [ ! -d "$meshDir" ] + then + echo "Error: no '$meshDir' in $caseDir" 1>&2 + exit 1 + fi +else + if [ -d constant/polyMesh ] + then + # use constant/polyMesh + meshDir=constant/polyMesh + elif [ -d polyMesh ] + then + # likely already in constant/ + meshDir=polyMesh + elif [ "${PWD##*/}" = polyMesh ] + then + # apparently already within polyMesh/ + meshDir=. + else + echo "Error: no appropriate 'polyMesh/' directory found" 1>&2 + exit 1 + fi +fi + + +# +# remove files and subdirectories +# +echo "Clearing ${caseDir:-.}/$meshDir" 1>&2 + +for i in \ + points \ + faces \ + owner \ + neighbour \ + cells \ + boundary \ + pointZones \ + faceZones \ + cellZones \ + meshModifiers \ + parallelData \ + sets \ +; +do + rm -rf $meshDir/$i +done #------------------------------------------------------------------------------ From 04ffbbc51a6df18c95937b1b803449b5227aa438 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 14 Jul 2008 11:00:41 +0200 Subject: [PATCH 05/11] foamAllHC / foamEbrowse / foamNew - error checking --- bin/foamAllHC | 7 +++++-- bin/foamEbrowse | 6 +++--- bin/foamNew | 22 +++++++++++++--------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/bin/foamAllHC b/bin/foamAllHC index e57d43dd27..b42ab672d5 100755 --- a/bin/foamAllHC +++ b/bin/foamAllHC @@ -27,9 +27,12 @@ # foamAllHC # # Description -# +# #------------------------------------------------------------------------------ -find . -name "*.[HCL]" -exec $1 {} \; -print +if [ "$#" -gt 0 ] +then + find . -name "*.[HCL]" -exec $1 {} \; -print +fi #------------------------------------------------------------------------------ diff --git a/bin/foamEbrowse b/bin/foamEbrowse index 70fa6cf585..aea1cd16f6 100755 --- a/bin/foamEbrowse +++ b/bin/foamEbrowse @@ -41,12 +41,12 @@ if [ $# -ne 0 ]; then exit 1 fi +# Clean up on termination and on Ctrl-C +trap 'rm -f $headersFile $sourcesFile 2>/dev/null; exit 0' EXIT TERM INT + cd $WM_PROJECT_DIR find -H . -name "*.H" | fgrep -v "lnInclude" > $headersFile find -H . -name "*.C" | fgrep -v "lnInclude" > $sourcesFile ebrowse --files=$headersFile --files=$sourcesFile --output-file=.ebrowse -# Clean up on termination and on Ctrl-C -trap 'rm -f $headersFile $sourcesFile 2>/dev/null; exit 0' EXIT TERM INT - #------------------------------------------------------------------------------ diff --git a/bin/foamNew b/bin/foamNew index f0f202a984..3900c3c74c 100755 --- a/bin/foamNew +++ b/bin/foamNew @@ -46,19 +46,23 @@ USAGE exit 1 } -if [ "$#" -lt 1 ]; then +if [ "$#" -lt 2 ] +then usage "wrong number of arguments, expected 2 (or more)" fi case "$1" in - source) - shift - $WM_PROJECT_DIR/bin/foamTemplates/source/newSource $* - ;; - template) - shift - $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/newSourceTemplate $* - ;; +-h | -help) + usage + ;; +source) + shift + $WM_PROJECT_DIR/bin/foamTemplates/source/newSource $* + ;; +template) + shift + $WM_PROJECT_DIR/bin/foamTemplates/sourceTemplate/newSourceTemplate $* + ;; *) usage "unknown type" ;; From ff2040f26fe40728afe44e6ed3df7fea5ae4b53e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 14 Jul 2008 14:49:20 +0200 Subject: [PATCH 06/11] fixup copyright dates --- .../utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C | 2 +- .../utilities/mesh/manipulation/createPatch/createPatch.C | 2 +- .../dataConversion/foamToEnsightParts/ensightOutputFunctions.C | 2 +- .../dataConversion/foamToEnsightParts/ensightOutputFunctions.H | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 15be3f9c1d..1df11e06da 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C index f9cc4cce30..9ba825083f 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C +++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C index a1b459c4a1..007fb1f6a2 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H index e2f5ef2860..70f5d33d73 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 5e5b26edd510380af6df1f60c905a8a45d9aefb0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 14 Jul 2008 14:50:35 +0200 Subject: [PATCH 07/11] update dictionary headers and FoamFile entry to 1.5 format --- applications/test/router/routerDict | 28 ++---- .../autoRefineMesh/autoRefineMeshDict | 37 +++----- .../mesh/advanced/modifyMesh/modifyMeshDict | 21 ++-- .../mesh/advanced/selectCells/selectCellsDict | 27 ++---- .../snappyHexMesh/snappyHexMeshDict | 37 +++----- .../mesh/manipulation/cellSet/cellSetDict | 25 ++--- .../manipulation/createPatch/createPatchDict | 22 ++--- .../mesh/manipulation/faceSet/faceSetDict | 22 ++--- .../manipulation/mirrorMesh/mirrorMeshDict | 30 +++--- .../mesh/manipulation/pointSet/pointSetDict | 26 ++--- .../manipulation/refineMesh/refineMeshDict | 27 ++---- .../foamDataToFluent/foamDataToFluentDict | 24 ++--- .../miscellaneous/postChannel/postChannelDict | 25 ++--- .../preProcessing/mapFields/mapFieldsDict | 26 ++--- .../preProcessing/setFields/setFieldsDict | 22 ++--- .../surface/surfaceSubset/surfaceSubsetDict | 28 +++--- .../adiabaticFlameT/Hydrogen.log | 20 ++-- .../adiabaticFlameT/Methane.log | 20 ++-- .../adiabaticFlameT/Propane.log | 38 ++------ .../adiabaticFlameT/controlDict | 95 +++++++++++++------ .../equilibriumFlameT/Hydrogen.log | 20 ++-- .../equilibriumFlameT/controlDict | 89 ++++++++++++----- .../dynamicRefineFvMesh/dynamicMeshDict | 23 ++--- src/postProcessing/fieldAverage/controlDict | 19 ++-- .../constant/dynamicMeshDict | 18 +--- .../constant/polyMesh/blockMeshDict | 35 +++---- .../constant/transportProperties | 22 ++--- .../iglooWithFridges/system/controlDict | 22 ++--- .../iglooWithFridges/system/fvSchemes | 22 ++--- .../iglooWithFridges/system/fvSolution | 24 ++--- .../iglooWithFridges/system/snappyHexMeshDict | 36 +++---- .../motorBike/constant/polyMesh/blockMeshDict | 34 +++---- .../motorBike/constant/transportProperties | 22 ++--- .../motorBike/system/controlDict | 22 ++--- .../snappyHexMesh/motorBike/system/fvSchemes | 22 ++--- .../snappyHexMesh/motorBike/system/fvSolution | 21 ++-- .../motorBike/system/snappyHexMeshDict | 36 +++---- 37 files changed, 447 insertions(+), 640 deletions(-) diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict index a1fce32c48..0d349d5f8b 100644 --- a/applications/test/router/routerDict +++ b/applications/test/router/routerDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 routeDict; + version 2.0; + format ascii; + class dictionary; + object routeDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,10 +26,3 @@ paths ); // ************************************************************************* // - - - - - - - diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict index e6a15b2d5b..1edf2946d6 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict @@ -1,33 +1,26 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 autoRefineMeshDict; + version 2.0; + format ascii; + class dictionary; + object autoRefineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Surface to keep to -surface "plexi.ftr"; +surface "plexi.ftr"; // What is outside. These points have to be inside a cell (so not on a face!) -outsidePoints ((-0.99001 -0.99001 -0.99001)); +outsidePoints ((-0.99001 -0.99001 -0.99001)); // @@ -51,11 +44,11 @@ curvature 0.9; nCutLayers 2; // Refine until smallest edge of mesh < minEdgeLen -minEdgeLen 0.1; +minEdgeLen 0.1; // Or until the number of cells would become more than (stops one level before // this) -cellLimit 2500000; +cellLimit 2500000; // @@ -111,16 +104,16 @@ directions // refinement level difference between neighbouring cells. Set to large if // there is no need for a limit. -splitLevel 2; +splitLevel 2; // Cut purely geometric (will cut hexes through vertices) or take topology // into account. -geometricCut false; +geometricCut false; // Whether to use hex topology. This will never cut hex through vertices. -useHexTopology yes; +useHexTopology yes; // Write meshes from intermediate steps -writeMesh true; +writeMesh true; // ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict index 7ddbdf5550..00cba81e43 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - class dictionary; - object modifyMeshDict; + version 2.0; + format ascii; + class dictionary; + object modifyMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict index ca1a66730d..6211d4c8f0 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict +++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 selectCellsDict; + version 2.0; + format ascii; + class dictionary; + object selectCellsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -25,13 +18,13 @@ FoamFile // Whether to use surface. If false no surface will be read and only // outsidePoints/selectOutside will be used to determine cells to keep. -useSurface false; +useSurface false; // Surface to keep to -surface "plexi.ftr"; +surface "plexi.ftr"; // What is outside -outsidePoints ((-1 -1 -1)); +outsidePoints ((-1 -1 -1)); // diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict index e97b1ee9a7..5777ae8a8a 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 autoHexMeshDict; + version 2.0; + format ascii; + class dictionary; + object autoHexMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -129,7 +122,7 @@ castellatedMeshControls { // Surface-wise min and max refinement level level (2 2); - + // Optional region-wise level specification regions { @@ -231,7 +224,7 @@ addLayersControls // is the // thickness of the layer furthest away from the wall. // Relative to undistorted size of cell outside layer. - finalLayerRatio 0.3; + finalLayerRatio 0.3; //- Minimum thickness of cell layer. If for any reason layer // cannot be above minThickness do not add layer. @@ -254,20 +247,20 @@ addLayersControls // before upon reaching a correct mesh. nRelaxIter 5; - // Number of smoothing iterations of surface normals + // Number of smoothing iterations of surface normals nSmoothSurfaceNormals 1; - // Number of smoothing iterations of interior mesh movement direction + // Number of smoothing iterations of interior mesh movement direction nSmoothNormals 3; // Smooth layer thickness over surface patches nSmoothThickness 10; - // Stop layer growth on highly warped cells + // Stop layer growth on highly warped cells maxFaceThicknessRatio 0.5; - // Reduce layer growth where ratio thickness to medial - // distance is large + // Reduce layer growth where ratio thickness to medial + // distance is large maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points @@ -313,7 +306,7 @@ meshQualityControls //- 1 = hex, <= 0 = folded or flattened illegal cell minDeterminant 0.001; - //- minFaceWeight (0 -> 0.5) + //- minFaceWeight (0 -> 0.5) minFaceWeight 0.05; //- minVolRatio (0 -> 1) diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSetDict b/applications/utilities/mesh/manipulation/cellSet/cellSetDict index ef169f5055..3bda8ccd01 100644 --- a/applications/utilities/mesh/manipulation/cellSet/cellSetDict +++ b/applications/utilities/mesh/manipulation/cellSet/cellSetDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - class dictionary; - object cellSetDict; + version 2.0; + format ascii; + class dictionary; + object cellSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -36,7 +29,7 @@ topoSetSources // Copy elements from cellSet cellToCell { - set c1; + set c1; } // Select based on faceSet @@ -51,7 +44,7 @@ topoSetSources } // Select based on pointSet - pointToCell + pointToCell { set p0; option any; // cell with any point in pointSet diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict index 31d0078021..1153d0204d 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict +++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 createPatcheDict; + version 2.0; + format ascii; + class dictionary; + object createPatchDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -29,7 +22,6 @@ matchTolerance 1E-3; // Do a synchronisation of coupled points. pointSync true; - // Patches to create. // If no patches does a coupled point and face synchronisation anyway. patches diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSetDict b/applications/utilities/mesh/manipulation/faceSet/faceSetDict index 4121a00018..4f6c0d1509 100644 --- a/applications/utilities/mesh/manipulation/faceSet/faceSetDict +++ b/applications/utilities/mesh/manipulation/faceSet/faceSetDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - class dictionary; - object faceSetDict; + version 2.0; + format ascii; + class dictionary; + object faceSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -86,5 +79,4 @@ topoSetSources } ); - // ************************************************************************* // diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict index cfa3e68d5f..bb6cfe7a1e 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict @@ -1,36 +1,28 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 1.0; - format ascii; - - root ""; - case ""; - instance "system"; - local ""; - - class dictionary; - object mirrorMeshDict; + version 2.0; + format ascii; + class dictionary; + object mirrorMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -planeType pointAndNormal; +planeType pointAndNormal; pointAndNormalDict { - basePoint (0 0 0); - normalVector (0 1 0); + basePoint (0 0 0); + normalVector (0 1 0); } -planeTolerance 1e-3; - +planeTolerance 1e-3; // ************************************************************************* // diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSetDict b/applications/utilities/mesh/manipulation/pointSet/pointSetDict index cb1c8b2d15..27a43d3ad9 100644 --- a/applications/utilities/mesh/manipulation/pointSet/pointSetDict +++ b/applications/utilities/mesh/manipulation/pointSet/pointSetDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - class dictionary; - object pointSetDict; + version 2.0; + format ascii; + class dictionary; + object pointSetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,9 +26,9 @@ action new; topoSetSources ( // Copy elements from pointSet - pointToPoint + pointToPoint { - set p1; + set p1; } // Select based on cellSet @@ -76,5 +69,4 @@ topoSetSources } ); - // ************************************************************************* // diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict index 67c49c13d5..f05502b755 100644 --- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict +++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 refineMeshDict; + version 2.0; + format ascii; + class dictionary; + object refineMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -59,13 +52,13 @@ directions // Whether to use hex topology. This will // - if patchLocal: all cells on selected patch should be hex // - split all hexes in 2x2x2 through the middle of edges. -useHexTopology true; +useHexTopology true; // Cut purely geometric (will cut hexes through vertices) or take topology // into account. Incompatible with useHexTopology -geometricCut false; +geometricCut false; // Write meshes from intermediate steps -writeMesh false; +writeMesh false; // ************************************************************************* // diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict index 32ca5ceb85..469257e90a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict +++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict @@ -1,25 +1,17 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - note "FOAM to Fluent interface control dictionary"; - - class dictionary; - object foamDataToFluentDict; + version 2.0; + format ascii; + note "OpenFOAM to Fluent interface control dictionary"; + class dictionary; + object foamDataToFluentDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict index cf5aedac36..1785207adc 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict @@ -1,31 +1,24 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object postChannelDict; + version 2.0; + format ascii; + class dictionary; + object postChannelDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Nx 40; -Ny +Ny ( - 50 + 50 ); Nz 30; diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict index d44eff5cba..3f78955a05 100644 --- a/applications/utilities/preProcessing/mapFields/mapFieldsDict +++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict @@ -1,39 +1,31 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object mapFieldsDict; + version 2.0; + format ascii; + class dictionary; + object mapFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // List of pairs of source/target patches for mapping -patchMap +patchMap ( lid movingWall ); // List of target patches cutting the source domain (these need to be // handled specially e.g. interpolated from internal values) -cuttingPatches +cuttingPatches ( fixedWalls ); - // ************************************************************************* // diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict index 4867e4f3bf..13521c5473 100644 --- a/applications/utilities/preProcessing/setFields/setFieldsDict +++ b/applications/utilities/preProcessing/setFields/setFieldsDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance "system"; - local ""; - - class dictionary; - object setFieldsDict; + version 2.0; + format ascii; + class dictionary; + object setFieldsDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,5 +34,4 @@ regions } ); - // ************************************************************************* // diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict index 5ca59575f8..70879af6f4 100644 --- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict +++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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.2/run/icoFoam"; - case "cavityTut"; - instance "system"; - local ""; - - class dictionary; - object surfaceSubsetDict; + version 2.0; + format ascii; + class dictionary; + object surfaceSubsetDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,9 +25,10 @@ localPoints ( ); edges (); // Select triangles (with face centre) inside box -zone ( -(0 -10000 125) -(10000 10000 10000) +zone +( + (0 -10000 125) + (10000 10000 10000) ); // Select triangles (with face centre) inside or outside of another surface. diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log index f3e81b294e..954e40b6b7 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log +++ b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log @@ -1,19 +1,19 @@ /*---------------------------------------------------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ +Exec : adiabaticFlameT -case . controlDict +Date : Jul 14 2008 +Time : 14:35:28 +Host : auglx106 +PID : 21193 +Case : ./. +nProcs : 1 -Exec : adiabaticFlameT controlDict -Date : Aug 20 2006 -Time : 12:23:19 -Host : dm -PID : 28866 -Root : -Case : -Nprocs : 1 +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Reading Burcat data dictionary stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 34.0752; diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log index f61db76d64..c27fa56c2e 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/Methane.log +++ b/applications/utilities/thermophysical/adiabaticFlameT/Methane.log @@ -1,19 +1,19 @@ /*---------------------------------------------------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.2.1 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ +Exec : adiabaticFlameT -case . controlDict +Date : Jul 14 2008 +Time : 14:36:14 +Host : auglx106 +PID : 21199 +Case : ./. +nProcs : 1 -Exec : adiabaticFlameT controlDict -Date : Dec 06 2005 -Time : 15:25:54 -Host : dm -PID : 19011 -Root : -Case : -Nprocs : 1 +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Reading Burcat data dictionary stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 17.1271; diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log index edab3b35ba..37aa406a65 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/Propane.log +++ b/applications/utilities/thermophysical/adiabaticFlameT/Propane.log @@ -1,39 +1,21 @@ /*---------------------------------------------------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ +Exec : adiabaticFlameT -case . controlDict +Date : Jul 14 2008 +Time : 14:36:39 +Host : auglx106 +PID : 21203 +Case : ./. +nProcs : 1 -Exec : adiabaticFlameT controlDict -Date : Dec 01 2004 -Time : 14:24:02 -Host : dm -PID : 8154 -Root : -Case : -Nprocs : 1 +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Reading Burcat data dictionary ---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry - CH3 ) 2 N-NO2 CH3 ) 2 N-NO2 1 90.0819 200 6000 1000 12.4704 0.0186035 -6.89302e-06 1.13155e-09 -6.84339e-14 -6246.84 -39.5039 4.2251 0.0224382 3.20606e-05 -5.84889e-08 2.50091e-11 -3013.8 7.7452; - on line 1067 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData" - entry already in dictionary : -ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::CH3, lines 553-555, IOstream: Version 2.0, format ASCII, line 553, OPENED, GOOD - ---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry - CH3 ) 2 CHOH CH3 ) 2 CHOH 1 60.0959 200 6000 1000 9.64268 0.0200225 -7.11954e-06 1.14138e-09 -6.79937e-14 -37484 -25.6345 4.30799 0.0102502 6.19844e-05 -9.03296e-08 3.7406e-11 -34924.9 7.5584; - on line 1387 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData" - entry already in dictionary : -ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::CH3, lines 553-555, IOstream: Version 2.0, format ASCII, line 553, OPENED, GOOD - ---> FOAM Warning : dictionary::read(Istream&, const word&) : could not add entry - NH2 NH2 1 16.0226 200 6000 1000 2.84766 0.00314285 -8.98666e-07 1.30324e-10 -7.48854e-15 21823.9 6.47181 4.20556 -0.00213553 7.2682e-06 -5.93028e-09 1.80672e-12 21535.2 -0.146632; - on line 3411 of dictionary "/home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData" - entry already in dictionary : -ITstream : /home/dm2/henry/OpenFOAM/OpenFOAM-1.0/.OpenFOAM-1.0/thermoData/BurcatCpData::NH2, lines 637-639, IOstream: Version 2.0, format ASCII, line 637, OPENED, GOOD - stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776; phi = 0.01 ft = 0.000641534 diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict index 5d9621792c..e7970f8e6d 100644 --- a/applications/utilities/thermophysical/adiabaticFlameT/controlDict +++ b/applications/utilities/thermophysical/adiabaticFlameT/controlDict @@ -1,36 +1,69 @@ -T0 300.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; + note "settings for calculating the adiabatic flame temperature"; + class dictionary; + object controlDict; +} -fuel H2; -n 0; -m 2; +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +T0 300.0; + +H2 +{ + fuel H2; + n 0; + m 2; +} + +CH4 +{ + fuel CH4(ANHARMONIC); + n 1; + m 4; +} + +ETHYLENE +{ + fuel ETHYLENE; + n 2; + m 4; +} + +PROPANE +{ + fuel PROPANE; + n 3; + m 8; +} + +OCTANE +{ + fuel ISO-OCTANE(I-P); + n 8; + m 18; +} + +C7H16 +{ + fuel C7H16; + n 7; + m 16; +} -/* -fuel CH4(ANHARMONIC); -n 1; -m 4; -*/ +$H2; +// $CH4; +// $PROPANE; -/* -fuel ETHYLENE; -n 2; -m 4; -*/ -/* -fuel PROPANE; -n 3; -m 8; -*/ - -/* -fuel ISO-OCTANE(I-P); -n 8; -m 18; -*/ - -/* -fuel C7H16; -n 7; -m 16; -*/ +// ************************************************************************* // diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log index bc84afd42d..8884bc2499 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log +++ b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log @@ -1,19 +1,19 @@ /*---------------------------------------------------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.3.2 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ +Exec : equilibriumFlameT -case . controlDict +Date : Jul 14 2008 +Time : 14:42:27 +Host : auglx106 +PID : 21318 +Case : ./. +nProcs : 1 -Exec : equilibriumFlameT controlDict -Date : Aug 20 2006 -Time : 12:29:44 -Host : dm -PID : 28934 -Root : -Case : -Nprocs : 1 +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Reading Burcat data dictionary diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict index 51f670d439..65893bfd38 100644 --- a/applications/utilities/thermophysical/equilibriumFlameT/controlDict +++ b/applications/utilities/thermophysical/equilibriumFlameT/controlDict @@ -1,30 +1,69 @@ -P 1e5; +/*--------------------------------*- 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; + note "settings for calculating the equilibrium flame temperature"; + class dictionary; + object controlDict; +} -fuel H2; -n 0; -m 2; +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -/* -fuel CH4ANHARMONIC; -n 1; -m 4; -*/ -/* -fuel ETHYLENE; -n 2; -m 4; -*/ +P 1e5; -/* -fuel PROPANE; -n 3; -m 8; -*/ +H2 +{ + fuel H2; + n 0; + m 2; +} -/* -fuel ISOOCTANE; -n 8; -m 18; -*/ +CH4 +{ + fuel CH4(ANHARMONIC); + n 1; + m 4; +} -end; +ETHYLENE +{ + fuel ETHYLENE; + n 2; + m 4; +} + +PROPANE +{ + fuel PROPANE; + n 3; + m 8; +} + +OCTANE +{ + fuel ISOOCTANE; + n 8; + m 18; +} + +C7H16 +{ + fuel C7H16; + n 7; + m 16; +} + + +$H2; +// $CH4; +// $PROPANE; + + +// ************************************************************************* // diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict index 48d9bfcedf..177824b65c 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict @@ -1,27 +1,16 @@ - - - - -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.openfoam.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object dynamicMeshDict; + version 2.0; + format ascii; + class dictionary; + object dynamicMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/postProcessing/fieldAverage/controlDict b/src/postProcessing/fieldAverage/controlDict index 5dc2b007f9..40e3a2d4a7 100644 --- a/src/postProcessing/fieldAverage/controlDict +++ b/src/postProcessing/fieldAverage/controlDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.openfoam.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; + version 2.0; + format ascii; + class dictionary; + object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict index 56eb2294e8..5bf94e70a2 100644 --- a/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict +++ b/tutorials/interDyMFoam/sloshingTank3D6DoF/constant/dynamicMeshDict @@ -1,23 +1,16 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4 | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: http://www.openfoam.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object motionProperties; + version 2.0; + format ascii; + class dictionary; + object motionProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,5 +31,4 @@ solidBodyMotionFvMeshCoeffs } } - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict index f842cbb8fd..d97dbb8e26 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict +++ b/tutorials/snappyHexMesh/iglooWithFridges/constant/polyMesh/blockMeshDict @@ -1,31 +1,23 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - convertToMeters 1; -vertices +vertices ( (-2.03 -2.0 0) ( 8.03 -2.0 0) @@ -37,18 +29,18 @@ vertices (-2.03 8.0 5) ); -blocks +blocks ( hex (0 1 2 3 4 5 6 7) (20 20 20) simpleGrading (1 1 1) ); -edges +edges ( ); -patches +patches ( - patch maxY + patch maxY ( (3 7 6 2) ) @@ -74,9 +66,8 @@ patches ) ); -mergePatchPairs +mergePatchPairs ( ); - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties b/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties index 285cbf44de..c61d913dc8 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties +++ b/tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties @@ -1,28 +1,20 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; + 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/iglooWithFridges/system/controlDict b/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict index 3303982fb7..36315909db 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict +++ b/tutorials/snappyHexMesh/iglooWithFridges/system/controlDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; + version 2.0; + format ascii; + class dictionary; + object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,5 +46,4 @@ timePrecision 6; runTimeModifiable yes; - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes index b89a35be13..51ebb81a9d 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes +++ b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSchemes @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; + version 2.0; + format ascii; + class dictionary; + object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -67,5 +60,4 @@ fluxRequired p; } - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution index da311c99cd..9e9998642e 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution +++ b/tutorials/snappyHexMesh/iglooWithFridges/system/fvSolution @@ -1,30 +1,23 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; + version 2.0; + format ascii; + class dictionary; + object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // solvers { - //p ICCG 1e-06 0; + // p ICCG 1e-06 0; p AMG 1e-06 0 10; U BICCG 1e-05 0; @@ -41,5 +34,4 @@ PISO pRefValue 0; } - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict b/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict index 3286958275..4b547f7a51 100644 --- a/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict +++ b/tutorials/snappyHexMesh/iglooWithFridges/system/snappyHexMeshDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 autoHexMeshDict; + version 2.0; + format ascii; + class dictionary; + object autoHexMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -219,7 +212,7 @@ addLayersControls // is the // thickness of the layer furthest away from the wall. // Relative to undistorted size of cell outside layer. - finalLayerRatio 0.5; + finalLayerRatio 0.5; //- Minimum thickness of cell layer. If for any reason layer // cannot be above minThickness do not add layer. @@ -242,20 +235,20 @@ addLayersControls // before upon reaching a correct mesh. nRelaxIter 5; - // Number of smoothing iterations of surface normals + // Number of smoothing iterations of surface normals nSmoothSurfaceNormals 1; - // Number of smoothing iterations of interior mesh movement direction + // Number of smoothing iterations of interior mesh movement direction nSmoothNormals 3; // Smooth layer thickness over surface patches nSmoothThickness 10; - // Stop layer growth on highly warped cells + // Stop layer growth on highly warped cells maxFaceThicknessRatio 0.5; - // Reduce layer growth where ratio thickness to medial - // distance is large + // Reduce layer growth where ratio thickness to medial + // distance is large maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points @@ -301,7 +294,7 @@ meshQualityControls //- 1 = hex, <= 0 = folded or flattened illegal cell minDeterminant 0.001; - //- minFaceWeight (0 -> 0.5) + //- minFaceWeight (0 -> 0.5) minFaceWeight 0.05; //- minVolRatio (0 -> 1) @@ -334,5 +327,4 @@ debug 0; // Note: the write tolerance needs to be higher than this. mergeTolerance 1E-6; - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict b/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict index ec09ef5e88..c618a0a9ac 100644 --- a/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict +++ b/tutorials/snappyHexMesh/motorBike/constant/polyMesh/blockMeshDict @@ -1,31 +1,23 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object blockMeshDict; + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - convertToMeters 1; -vertices +vertices ( (-20.29 -10 -4.232e-05) ( 41.71 -10 -4.232e-05) @@ -37,18 +29,18 @@ vertices (-20.29 10 20) ); -blocks +blocks ( hex (0 1 2 3 4 5 6 7) (60 20 20) simpleGrading (1 1 1) ); -edges +edges ( ); -patches +patches ( - patch maxY + patch maxY ( (3 7 6 2) ) @@ -74,7 +66,7 @@ patches ) ); -mergePatchPairs +mergePatchPairs ( ); diff --git a/tutorials/snappyHexMesh/motorBike/constant/transportProperties b/tutorials/snappyHexMesh/motorBike/constant/transportProperties index 285cbf44de..c61d913dc8 100644 --- a/tutorials/snappyHexMesh/motorBike/constant/transportProperties +++ b/tutorials/snappyHexMesh/motorBike/constant/transportProperties @@ -1,28 +1,20 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object transportProperties; + 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/system/controlDict b/tutorials/snappyHexMesh/motorBike/system/controlDict index 3303982fb7..36315909db 100644 --- a/tutorials/snappyHexMesh/motorBike/system/controlDict +++ b/tutorials/snappyHexMesh/motorBike/system/controlDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object controlDict; + version 2.0; + format ascii; + class dictionary; + object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,5 +46,4 @@ timePrecision 6; runTimeModifiable yes; - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSchemes b/tutorials/snappyHexMesh/motorBike/system/fvSchemes index b89a35be13..51ebb81a9d 100644 --- a/tutorials/snappyHexMesh/motorBike/system/fvSchemes +++ b/tutorials/snappyHexMesh/motorBike/system/fvSchemes @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSchemes; + version 2.0; + format ascii; + class dictionary; + object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -67,5 +60,4 @@ fluxRequired p; } - // ************************************************************************* // diff --git a/tutorials/snappyHexMesh/motorBike/system/fvSolution b/tutorials/snappyHexMesh/motorBike/system/fvSolution index da311c99cd..242f5524a2 100644 --- a/tutorials/snappyHexMesh/motorBike/system/fvSolution +++ b/tutorials/snappyHexMesh/motorBike/system/fvSolution @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root ""; - case ""; - instance ""; - local ""; - - class dictionary; - object fvSolution; + version 2.0; + format ascii; + class dictionary; + object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict b/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict index 5e206f019f..e3d24a6921 100644 --- a/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict +++ b/tutorials/snappyHexMesh/motorBike/system/snappyHexMeshDict @@ -1,23 +1,16 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.0 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / 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 autoHexMeshDict; + version 2.0; + format ascii; + class dictionary; + object autoHexMeshDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -466,7 +459,7 @@ addLayersControls // is the // thickness of the layer furthest away from the wall. // Relative to undistorted size of cell outside layer. - finalLayerRatio 0.3; + finalLayerRatio 0.3; //- Minimum thickness of cell layer. If for any reason layer // cannot be above minThickness do not add layer. @@ -489,20 +482,20 @@ addLayersControls // before upon reaching a correct mesh. nRelaxIter 3; - // Number of smoothing iterations of surface normals + // Number of smoothing iterations of surface normals nSmoothSurfaceNormals 1; - // Number of smoothing iterations of interior mesh movement direction + // Number of smoothing iterations of interior mesh movement direction nSmoothNormals 3; // Smooth layer thickness over surface patches nSmoothThickness 10; - // Stop layer growth on highly warped cells + // Stop layer growth on highly warped cells maxFaceThicknessRatio 0.5; - // Reduce layer growth where ratio thickness to medial - // distance is large + // Reduce layer growth where ratio thickness to medial + // distance is large maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points @@ -548,7 +541,7 @@ meshQualityControls //- 1 = hex, <= 0 = folded or flattened illegal cell minDeterminant 0.001; - //- minFaceWeight (0 -> 0.5) + //- minFaceWeight (0 -> 0.5) minFaceWeight 0.02; //- minVolRatio (0 -> 1) @@ -581,5 +574,4 @@ debug 0; // Note: the write tolerance needs to be higher than this. mergeTolerance 1E-6; - // ************************************************************************* // From 17ab54d3814aff3e0b158413bb8052e75daf3851 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Jul 2008 22:06:11 +0100 Subject: [PATCH 08/11] extraneous autoPtr --- .../chtMultiRegionFoam/fluid/createFluidFields.H | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index 6460cc9990..39367bb6bf 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -47,10 +47,7 @@ thermof.set ( i, - autoPtr - ( - basicThermo::New(fluidRegions[i]) - ).ptr() + basicThermo::New(fluidRegions[i]).ptr() ); Info<< " Adding to rhof\n" << endl; From 8e3d196ec8ec3f23f84b5a8a05cbc7ea420a0a34 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Jul 2008 22:06:26 +0100 Subject: [PATCH 09/11] logic --- applications/utilities/mesh/manipulation/setSet/setSet.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C index 2d70f797c7..f8f05747f8 100644 --- a/applications/utilities/mesh/manipulation/setSet/setSet.C +++ b/applications/utilities/mesh/manipulation/setSet/setSet.C @@ -762,7 +762,7 @@ int main(int argc, char *argv[]) Pout<< "Please type 'help', 'quit' or a set command after prompt." << endl; - bool ok = false; + bool ok = true; FatalError.throwExceptions(); FatalIOError.throwExceptions(); From 67c010c72903ac87a0b3bf6cff13de8a5f08c1d3 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 15 Jul 2008 22:10:40 +0100 Subject: [PATCH 10/11] chtMultiRegionFoam tutorial --- .../chtMultiRegionFoam/multiRegionHeater/0/K | 53 +++ .../chtMultiRegionFoam/multiRegionHeater/0/T | 54 +++ .../chtMultiRegionFoam/multiRegionHeater/0/U | 59 ++++ .../chtMultiRegionFoam/multiRegionHeater/0/cp | 53 +++ .../multiRegionHeater/0/epsilon | 54 +++ .../chtMultiRegionFoam/multiRegionHeater/0/k | 54 +++ .../chtMultiRegionFoam/multiRegionHeater/0/p | 58 ++++ .../chtMultiRegionFoam/multiRegionHeater/0/pd | 58 ++++ .../multiRegionHeater/0/rho | 53 +++ .../multiRegionHeater/Allclean | 7 + .../multiRegionHeater/Allrun | 19 ++ .../constant/bottomAir/RASProperties | 105 ++++++ .../bottomAir/environmentalProperties | 28 ++ .../bottomAir/thermophysicalProperties | 30 ++ .../constant/polyMesh/blockMeshDict | 82 +++++ .../constant/polyMesh/boundary | 58 ++++ .../constant/regionProperties | 41 +++ .../constant/topAir/RASProperties | 106 ++++++ .../constant/topAir/environmentalProperties | 1 + .../constant/topAir/thermophysicalProperties | 1 + .../multiRegionHeater/makeCellSets.setSet | 11 + .../system/bottomAir/changeDictionaryDict | 313 +++++++++++++++++ .../system/bottomAir/fvSchemes | 78 +++++ .../system/bottomAir/fvSolution | 118 +++++++ .../system/changeDictionaryDict | 195 +++++++++++ .../multiRegionHeater/system/controlDict | 61 ++++ .../multiRegionHeater/system/fvSchemes | 68 ++++ .../multiRegionHeater/system/fvSolution | 132 +++++++ .../system/heater/changeDictionaryDict | 195 +++++++++++ .../multiRegionHeater/system/heater/fvSchemes | 62 ++++ .../system/heater/fvSolution | 41 +++ .../system/leftSolid/changeDictionaryDict | 171 ++++++++++ .../system/leftSolid/fvSchemes | 1 + .../system/leftSolid/fvSolution | 1 + .../system/rightSolid/changeDictionaryDict | 170 +++++++++ .../system/rightSolid/fvSchemes | 1 + .../system/rightSolid/fvSolution | 1 + .../system/topAir/changeDictionaryDict | 322 ++++++++++++++++++ .../multiRegionHeater/system/topAir/fvSchemes | 1 + .../system/topAir/fvSolution | 1 + 40 files changed, 2917 insertions(+) create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/K create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/T create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/U create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/k create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/p create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho create mode 100755 tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean create mode 100755 tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSolution create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution create mode 100644 tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes create mode 120000 tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/K b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/K new file mode 100644 index 0000000000..d216becb76 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/K @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object K; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 1 -3 -1 0 0 0]; + +internalField uniform 80; + +boundaryField +{ + minX + { + type zeroGradient; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/T b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/T new file mode 100644 index 0000000000..29e55ac27f --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/T @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 300; + +boundaryField +{ + minX + { + type fixedValue; + value uniform 300; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/U b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/U new file mode 100644 index 0000000000..528c16391f --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/U @@ -0,0 +1,59 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0.01 0 0); + +boundaryField +{ + minX + { + type fixedValue; + value uniform (0.01 0 0); + } + maxX + { + type inletOutlet; + inletValue uniform (0 0 0); + } + + minY + { + type fixedValue; + value uniform (0 0 0); + } + maxY + { + type fixedValue; + value uniform (0 0 0); + } + + minZ + { + type fixedValue; + value uniform (0 0 0); + } + maxZ + { + type fixedValue; + value uniform (0 0 0); + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp new file mode 100644 index 0000000000..bc53e05c86 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/cp @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object cp; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 -1 0 0 0]; + +internalField uniform 450; + +boundaryField +{ + minX + { + type zeroGradient; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon new file mode 100644 index 0000000000..c79030383f --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/epsilon @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object epsilon; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -3 0 0 0 0]; + +internalField uniform 0.01; + +boundaryField +{ + minX + { + type fixedValue; + value uniform 0.01; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/k b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/k new file mode 100644 index 0000000000..c491981bf7 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/k @@ -0,0 +1,54 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object k; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 0.1; + +boundaryField +{ + minX + { + type fixedValue; + value uniform 0.1; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/p b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/p new file mode 100644 index 0000000000..9605bb7ff5 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/p @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + minX + { + type calculated; + value uniform 0; + } + maxX + { + type calculated; + value uniform 0; + } + + minY + { + type calculated; + value uniform 0; + } + maxY + { + type calculated; + value uniform 0; + } + minZ + { + type calculated; + value uniform 0; + } + maxZ + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd new file mode 100644 index 0000000000..1d0ac0a6a1 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/pd @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + minX + { + type zeroGradient; + value uniform 0; + } + maxX + { + type fixedValue; + value uniform 0; + } + + minY + { + type zeroGradient; + value uniform 0; + } + maxY + { + type zeroGradient; + value uniform 0; + } + minZ + { + type zeroGradient; + value uniform 0; + } + maxZ + { + type zeroGradient; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho new file mode 100644 index 0000000000..24f6f2d0c0 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/0/rho @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4.2 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object rho; + location "0.003"; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 0 0 0 0 0]; + +internalField uniform 8000; + +boundaryField +{ + minX + { + type zeroGradient; + } + maxX + { + type zeroGradient; + } + + minY + { + type zeroGradient; + } + maxY + { + type zeroGradient; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean new file mode 100755 index 0000000000..aeb3ee5b7b --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allclean @@ -0,0 +1,7 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -r VTK diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun new file mode 100755 index 0000000000..3a79aca5a9 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -0,0 +1,19 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +rm -r constant/polyMesh/sets +runApplication blockMesh +runApplication setSet -batch makeCellSets.setSet +rm constant/polyMesh/sets/*_old +runApplication setsToZones -noFlipMap +runApplication splitMeshRegions -cellZones +changeDictionary -region bottomAir +changeDictionary -region topAir +changeDictionary -region heater +changeDictionary -region leftSolid +changeDictionary -region rightSolid +runApplication chtMultiRegionFoam + + + diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties new file mode 100644 index 0000000000..66160205bc --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/RASProperties @@ -0,0 +1,105 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object RASProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel kEpsilon; + +turbulence off; + +laminarCoeffs +{ +} + +kEpsilonCoeffs +{ + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphah 1; + alphak 1; + alphaEps 0.76923; +} + +RNGkEpsilonCoeffs +{ + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; +} + +LaunderSharmaKECoeffs +{ + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; +} + +LRRCoeffs +{ + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + alphah 1; + Cs 0.25; + Ceps 0.15; + alphaR 1; + alphaEps 0.76923; +} + +LaunderGibsonRSTMCoeffs +{ + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + alphah 1; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaR 1; + alphaEps 0.76923; +} + +wallFunctionCoeffs +{ + kappa 0.4187; + E 9; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties new file mode 100644 index 0000000000..e9aee6c9b5 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties @@ -0,0 +1,28 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object environmentalProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +g g [0 1 -2 0 0 0 0] (0 -9.81 0); + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties new file mode 100644 index 0000000000..ca90242d7d --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -0,0 +1,30 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object thermophysicalProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType hThermo>>>>; + +mixture air 1 28.9 1000 0 1.8e-05 0.7; + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict new file mode 100644 index 0000000000..a0733096f9 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/blockMeshDict @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.0 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object blockMeshDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +convertToMeters 1; + +vertices +( + (-0.1 -0.04 -0.05) + ( 0.1 -0.04 -0.05) + ( 0.1 0.04 -0.05) + (-0.1 0.04 -0.05) + (-0.1 -0.04 0.05) + ( 0.1 -0.04 0.05) + ( 0.1 0.04 0.05) + (-0.1 0.04 0.05) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (30 10 10) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + wall maxY + ( + (3 7 6 2) + ) + patch minX + ( + (0 4 7 3) + ) + patch maxX + ( + (2 6 5 1) + ) + wall minY + ( + (1 5 4 0) + ) + wall minZ + ( + (0 3 2 1) + ) + wall maxZ + ( + (4 5 6 7) + ) +); + +mergePatchPairs +( +); + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary new file mode 100644 index 0000000000..f47b89c705 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + maxY + { + type wall; + nFaces 300; + startFace 8300; + } + minX + { + type patch; + nFaces 100; + startFace 8600; + } + maxX + { + type patch; + nFaces 100; + startFace 8700; + } + minY + { + type wall; + nFaces 300; + startFace 8800; + } + minZ + { + type wall; + nFaces 300; + startFace 9100; + } + maxZ + { + type wall; + nFaces 300; + startFace 9400; + } +) + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties new file mode 100644 index 0000000000..6bff0e8cff --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/regionProperties @@ -0,0 +1,41 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.0 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object regionProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +fluidRegionNames +( + bottomAir + topAir +); + + +solidRegionNames +( + heater + leftSolid + rightSolid +); + +pRef 100000; + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties new file mode 100644 index 0000000000..a0307ea431 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/RASProperties @@ -0,0 +1,106 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object RASProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel kEpsilon; + +//turbulence on; +turbulence off; + +laminarCoeffs +{ +} + +kEpsilonCoeffs +{ + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 0.85; + alphah 1; + alphak 1; + alphaEps 0.76923; +} + +RNGkEpsilonCoeffs +{ + Cmu 0.0845; + C1 1.42; + C2 1.68; + C3 -0.33; + alphah 1; + alphak 1.39; + alphaEps 1.39; + eta0 4.38; + beta 0.012; +} + +LaunderSharmaKECoeffs +{ + Cmu 0.09; + C1 1.44; + C2 1.92; + C3 -0.33; + alphah 1; + alphak 1; + alphaEps 0.76923; +} + +LRRCoeffs +{ + Cmu 0.09; + Clrr1 1.8; + Clrr2 0.6; + C1 1.44; + C2 1.92; + alphah 1; + Cs 0.25; + Ceps 0.15; + alphaR 1; + alphaEps 0.76923; +} + +LaunderGibsonRSTMCoeffs +{ + Cmu 0.09; + Clg1 1.8; + Clg2 0.6; + C1 1.44; + C2 1.92; + alphah 1; + C1Ref 0.5; + C2Ref 0.3; + Cs 0.25; + Ceps 0.15; + alphaR 1; + alphaEps 0.76923; +} + +wallFunctionCoeffs +{ + kappa 0.4187; + E 9; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties new file mode 120000 index 0000000000..9cb87f2395 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties @@ -0,0 +1 @@ +../bottomAir/environmentalProperties \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties new file mode 120000 index 0000000000..bd35030a13 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -0,0 +1 @@ +../bottomAir/thermophysicalProperties \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet b/tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet new file mode 100644 index 0000000000..84c52f85b3 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/makeCellSets.setSet @@ -0,0 +1,11 @@ +cellSet heater new boxToCell (-0.01 0 -100 )(0.01 0.01 100) +cellSet heater add boxToCell (-0.01 -100 -0.01)(0.01 0.01 0.01) +cellSet leftSolid new boxToCell (-100 0 -100 )(-0.01 0.01 100) +cellSet rightSolid new boxToCell (0.01 0 -100 )(100 0.01 100) +cellSet topAir new boxToCell (-100 0.01 -100 )(100 100 100) +cellSet bottomAir clear +cellSet bottomAir add cellToCell heater +cellSet bottomAir add cellToCell leftSolid +cellSet bottomAir add cellToCell rightSolid +cellSet bottomAir add cellToCell topAir +cellSet bottomAir invert diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict new file mode 100644 index 0000000000..1a89c964f2 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict @@ -0,0 +1,313 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + U + { + internalField uniform (0 0 0); + boundaryField + { + minX + { + type fixedValue; + value uniform (0 0 0); + } + maxX + { + type fixedValue; + value uniform (0 0 0); + } + + + bottomAir_to_leftSolid + { + type fixedValue; + value uniform (0 0 0); + + } + bottomAir_to_heater + { + type fixedValue; + value uniform (0 0 0); + } + bottomAir_to_rightSolid + { + type fixedValue; + value uniform (0 0 0); + } + } + } + + + + T + { + boundaryField + { + minX + { + type zeroGradient; + } + bottomAir_to_leftSolid + { + type solidWallTemperatureCoupled; + neighbourRegionName leftSolid; + neighbourPatchName leftSolid_to_bottomAir; + neighbourFieldName T; + K K; + value uniform 300; + + } + bottomAir_to_heater + { + type solidWallTemperatureCoupled; + neighbourRegionName heater; + neighbourPatchName heater_to_bottomAir; + neighbourFieldName T; + K K; + value uniform 300; + } + bottomAir_to_rightSolid + { + type solidWallTemperatureCoupled; + neighbourRegionName rightSolid; + neighbourPatchName rightSolid_to_bottomAir; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + + epsilon + { + // Set the value on all bc to non-zero. Not used in simulation + // since zeroGradient; only used in initialisation. + internalField uniform 0.01; + + boundaryField + { + minX + { + type zeroGradient; + value uniform 0.01; + } + maxX + { + type zeroGradient; + value uniform 0.01; + } + + minY + { + type zeroGradient; + value uniform 0.01; + } + maxY + { + type zeroGradient; + value uniform 0.01; + } + + minZ + { + type zeroGradient; + value uniform 0.01; + } + maxZ + { + type zeroGradient; + value uniform 0.01; + } + + bottomAir_to_leftSolid + { + type zeroGradient; + value uniform 0.01; + } + bottomAir_to_heater + { + type zeroGradient; + value uniform 0.01; + } + bottomAir_to_rightSolid + { + type zeroGradient; + value uniform 0.01; + } + } + } + + + k + { + internalField uniform 0.1; + boundaryField + { + minX + { + type zeroGradient; + value uniform 0.1; + } + maxX + { + type zeroGradient; + value uniform 0.1; + } + + minY + { + type zeroGradient; + value uniform 0.1; + } + maxY + { + type zeroGradient; + value uniform 0.1; + } + + minZ + { + type zeroGradient; + value uniform 0.1; + } + maxZ + { + type zeroGradient; + value uniform 0.1; + } + + bottomAir_to_leftSolid + { + type zeroGradient; + value uniform 0.1; + } + bottomAir_to_heater + { + type zeroGradient; + value uniform 0.1; + } + bottomAir_to_rightSolid + { + type zeroGradient; + value uniform 0.1; + } + } + } + + + pd + { + boundaryField + { + minX + { + type fixedFluxBuoyantPressure; + value 0; + } + maxX + { + type fixedFluxBuoyantPressure; + value 0; + } + minY + { + type fixedFluxBuoyantPressure; + value 0; + } + minZ + { + type fixedFluxBuoyantPressure; + value 0; + } + maxZ + { + type fixedFluxBuoyantPressure; + value 0; + } + bottomAir_to_leftSolid + { + type fixedFluxBuoyantPressure; + value 0; + } + bottomAir_to_heater + { + type fixedFluxBuoyantPressure; + value 0; + } + bottomAir_to_rightSolid + { + type fixedFluxBuoyantPressure; + value 0; + } + } + } + + + p + { + internalField uniform 1000000; + boundaryField + { + minX + { + type calculated; + value uniform 1000000; + } + maxX + { + type calculated; + value uniform 1000000; + } + minY + { + type calculated; + value uniform 1000000; + } + minZ + { + type calculated; + value uniform 1000000; + } + maxZ + { + type calculated; + value uniform 1000000; + } + + bottomAir_to_leftSolid + { + type calculated; + value uniform 1000000; + } + bottomAir_to_heater + { + type calculated; + value uniform 1000000; + } + bottomAir_to_rightSolid + { + type calculated; + value uniform 1000000; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes new file mode 100644 index 0000000000..73309294bf --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes @@ -0,0 +1,78 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSchemes; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; + //default CoEuler phi rho 0.1; +} + +gradSchemes +{ + default Gauss linear; +// grad(U) cellLimited Gauss linear 1; +} + +divSchemes +{ + default none; + div(phi,U) Gauss upwind; + div(phiU,p) Gauss upwind; + div(phi,h) Gauss upwind; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(phi,R) Gauss upwind; + div(R) Gauss linear; + div((muEff*dev2(grad(U).T()))) Gauss linear; +} + +laplacianSchemes +{ + default none; + laplacian(muEff,U) Gauss linear limited 0.333; + laplacian((rho*(1|A(U))),pd) Gauss linear limited 0.333; + laplacian(alphaEff,h) Gauss linear limited 0.333; + laplacian(DkEff,k) Gauss linear limited 0.333; + laplacian(DepsilonEff,epsilon) Gauss linear limited 0.333; + laplacian(DREff,R) Gauss linear limited 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited 0.333; +} + +fluxRequired +{ + default no; + pd; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution new file mode 100644 index 0000000000..e82c183b18 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSolution @@ -0,0 +1,118 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSolution; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho PCG + { + preconditioner DIC; + tolerance 1e-6; + relTol 0; + }; +// pd PCG +// { +// preconditioner DIC; +// tolerance 1e-6; +// relTol 0.1; +// }; +// pdFinal PCG +// { +// preconditioner DIC; +// tolerance 1e-08; +// relTol 0; +// }; + pd GAMG + { + tolerance 1e-6; + relTol 0.1; + + smoother GaussSeidel; + + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + pdFinal GAMG + { + tolerance 1e-6; + relTol 0; + + smoother GaussSeidel; + + cacheAgglomeration true; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + U PBiCG + { + preconditioner DILU; + tolerance 1e-08; + relTol 0; + }; + h PBiCG + { + preconditioner DILU; + tolerance 1e-06; + relTol 0; + }; + k PBiCG + { + preconditioner DILU; + tolerance 1e-06; + relTol 0; + }; + epsilon PBiCG + { + preconditioner DILU; + tolerance 1e-06; + relTol 0; + }; + R PBiCG + { + preconditioner DILU; + tolerance 1e-06; + relTol 0; + }; +} + +PISO +{ + momentumPredictor off; + nOuterCorrectors 1; + nCorrectors 2; + nNonOrthogonalCorrectors 1; + pdRefCell 0; + pdRefValue 0; +} + +//relaxationFactors +//{ +//// h 0.9; +// U 0.9; +//} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict new file mode 100644 index 0000000000..5c53b44a23 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/changeDictionaryDict @@ -0,0 +1,195 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + T + { + internalField uniform 300; + + boundaryField + { + minY + { + type fixedValue; + value uniform 500; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + + heater_to_domain0 + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName domain0; + neighbourPatchName domain0_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + + } + heater_to_solid1 + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName solid1; + neighbourPatchName solid1_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + heater_to_solid3 + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName solid3; + neighbourPatchName solid3_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + heater_to_domain3 + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName domain3; + neighbourPatchName domain3_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + rho + { + internalField uniform 8000; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_domain0 + { + type zeroGradient; + } + heater_to_solid1 + { + type zeroGradient; + } + heater_to_solid3 + { + type zeroGradient; + } + heater_to_domain3 + { + type zeroGradient; + } + } + } + + + K + { + internalField uniform 80; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_domain0 + { + type zeroGradient; + } + heater_to_solid1 + { + type zeroGradient; + } + heater_to_solid3 + { + type zeroGradient; + } + heater_to_domain3 + { + type zeroGradient; + } + } + } + + + cp + { + internalField uniform 450; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_domain0 + { + type zeroGradient; + } + heater_to_solid1 + { + type zeroGradient; + } + heater_to_solid3 + { + type zeroGradient; + } + heater_to_domain3 + { + type zeroGradient; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict new file mode 100644 index 0000000000..cab5c5b147 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/controlDict @@ -0,0 +1,61 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object controlDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application chtFoam; + +startFrom latestTime; + +startTime 0; + +stopAt endTime; + +endTime 180; + +deltaT 0.001; + +writeControl adjustableRunTime; +writeInterval 5; +//writeControl timeStep; +//writeInterval 20; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 7; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +maxCo 0.3; + +adjustTimeStep yes; + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes new file mode 100644 index 0000000000..d628f9178e --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSchemes @@ -0,0 +1,68 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSchemes; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(U) Gauss linear; + grad(gamma) Gauss linear; +} + +divSchemes +{ + div(rho*phi,U) Gauss upwind; //limitedLinearV 1; + div(phi,gamma) Gauss vanLeer; + div(phirb,gamma) Gauss interfaceCompression; +} + +laplacianSchemes +{ + default Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + pd; + pcorr; + gamma; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSolution new file mode 100644 index 0000000000..23e4e222d0 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/fvSolution @@ -0,0 +1,132 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSolution; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + pcorr PCG + { + preconditioner GAMG + { + tolerance 1e-3; + relTol 0; + + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nBottomSweeps 2; + + cacheAgglomeration false; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + + tolerance 1e-4; + relTol 0; + maxIter 100; + }; + + pd GAMG + { + tolerance 1e-8; + relTol 0.05; + + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; + + cacheAgglomeration false; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + + pdFinal PCG + { + preconditioner GAMG + { + tolerance 1e-8; + relTol 0; + + nVcycles 2; + + smoother GaussSeidel; + nPreSweeps 0; + nPostSweeps 2; + nFinestSweeps 2; + + cacheAgglomeration false; + nCellsInCoarsestLevel 10; + agglomerator faceAreaPair; + mergeLevels 1; + }; + + tolerance 1e-8; + relTol 0; + maxIter 20; + }; + + U smoothSolver + { + smoother GaussSeidel; + tolerance 1e-6; + relTol 0; + nSweeps 1; + }; + + k PBiCG + { + preconditioner DILU; + tolerance 1e-08; + relTol 0; + }; + B PBiCG + { + preconditioner DILU; + tolerance 1e-08; + relTol 0; + }; + nuTilda PBiCG + { + preconditioner DILU; + tolerance 1e-08; + relTol 0; + }; +} + +PISO +{ + momentumPredictor no; + nCorrectors 3; + nNonOrthogonalCorrectors 0; + nGammaCorr 1; + nGammaSubCycles 3; + cGamma 1; + pdRefCell 0; + pdRefValue 0; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict new file mode 100644 index 0000000000..1a50cc17b9 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict @@ -0,0 +1,195 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + T + { + internalField uniform 300; + + boundaryField + { + minY + { + type fixedValue; + value uniform 500; + } + + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + + heater_to_bottomAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName bottomAir; + neighbourPatchName bottomAir_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + + } + heater_to_leftSolid + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName leftSolid; + neighbourPatchName leftSolid_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + heater_to_rightSolid + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName rightSolid; + neighbourPatchName rightSolid_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + heater_to_topAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName topAir; + neighbourPatchName topAir_to_heater; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + rho + { + internalField uniform 8000; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_bottomAir + { + type zeroGradient; + } + heater_to_leftSolid + { + type zeroGradient; + } + heater_to_rightSolid + { + type zeroGradient; + } + heater_to_topAir + { + type zeroGradient; + } + } + } + + + K + { + internalField uniform 80; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_bottomAir + { + type zeroGradient; + } + heater_to_leftSolid + { + type zeroGradient; + } + heater_to_rightSolid + { + type zeroGradient; + } + heater_to_topAir + { + type zeroGradient; + } + } + } + + + cp + { + internalField uniform 450; + + boundaryField + { + minY + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + heater_to_bottomAir + { + type zeroGradient; + } + heater_to_leftSolid + { + type zeroGradient; + } + heater_to_rightSolid + { + type zeroGradient; + } + heater_to_topAir + { + type zeroGradient; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes new file mode 100644 index 0000000000..e1c5ba8e18 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSchemes @@ -0,0 +1,62 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSchemes; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; +} + +laplacianSchemes +{ + default none; + laplacian(K,T) Gauss linear limited 0.333; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default limited 0.333; +} + +fluxRequired +{ + default no; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution new file mode 100644 index 0000000000..648c2282b5 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/heater/fvSolution @@ -0,0 +1,41 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object fvSolution; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + T PCG + { + preconditioner DIC; + tolerance 1E-06; + relTol 0; + }; +} + +PISO +{ + nNonOrthogonalCorrectors 1; +} + + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict new file mode 100644 index 0000000000..a6fd49e467 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict @@ -0,0 +1,171 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + T + { + internalField uniform 300; + + boundaryField + { + minX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + leftSolid_to_bottomAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName bottomAir; + neighbourPatchName bottomAir_to_leftSolid; + neighbourFieldName T; + K K; + value uniform 300; + + } + leftSolid_to_heater + { + type solidWallTemperatureCoupled; + neighbourRegionName heater; + neighbourPatchName heater_to_leftSolid; + neighbourFieldName T; + K K; + value uniform 300; + } + leftSolid_to_topAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName topAir; + neighbourPatchName topAir_to_leftSolid; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + rho + { + internalField uniform 8000; + + boundaryField + { + minX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + leftSolid_to_bottomAir + { + type zeroGradient; + } + leftSolid_to_heater + { + type zeroGradient; + } + leftSolid_to_topAir + { + type zeroGradient; + } + } + } + + + K + { + internalField uniform 80; + + boundaryField + { + minX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + leftSolid_to_bottomAir + { + type zeroGradient; + } + leftSolid_to_heater + { + type zeroGradient; + } + leftSolid_to_topAir + { + type zeroGradient; + } + } + } + + + cp + { + internalField uniform 450; + + boundaryField + { + minX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + leftSolid_to_bottomAir + { + type zeroGradient; + } + leftSolid_to_heater + { + type zeroGradient; + } + leftSolid_to_topAir + { + type zeroGradient; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes new file mode 120000 index 0000000000..63236f302c --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSchemes @@ -0,0 +1 @@ +../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution new file mode 120000 index 0000000000..0bde0fc62f --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/fvSolution @@ -0,0 +1 @@ +../heater/fvSolution \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict new file mode 100644 index 0000000000..1ad8174abb --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict @@ -0,0 +1,170 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + T + { + internalField uniform 300; + + boundaryField + { + maxX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + rightSolid_to_heater + { + type solidWallTemperatureCoupled; + neighbourRegionName heater; + neighbourPatchName heater_to_rightSolid; + neighbourFieldName T; + K K; + value uniform 300; + } + rightSolid_to_bottomAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName bottomAir; + neighbourPatchName bottomAir_to_rightSolid; + neighbourFieldName T; + K K; + value uniform 300; + } + rightSolid_to_topAir + { + type solidWallHeatFluxTemperatureCoupled; + neighbourRegionName topAir; + neighbourPatchName topAir_to_rightSolid; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + rho + { + internalField uniform 8000; + + boundaryField + { + maxX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + rightSolid_to_bottomAir + { + type zeroGradient; + } + rightSolid_to_heater + { + type zeroGradient; + } + rightSolid_to_topAir + { + type zeroGradient; + } + } + } + + + K + { + internalField uniform 80; + + boundaryField + { + maxX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + rightSolid_to_bottomAir + { + type zeroGradient; + } + rightSolid_to_heater + { + type zeroGradient; + } + rightSolid_to_topAir + { + type zeroGradient; + } + } + } + + + cp + { + internalField uniform 450; + + boundaryField + { + maxX + { + type zeroGradient; + } + minZ + { + type zeroGradient; + } + maxZ + { + type zeroGradient; + } + rightSolid_to_bottomAir + { + type zeroGradient; + } + rightSolid_to_heater + { + type zeroGradient; + } + rightSolid_to_topAir + { + type zeroGradient; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes new file mode 120000 index 0000000000..63236f302c --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSchemes @@ -0,0 +1 @@ +../heater/fvSchemes \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution new file mode 120000 index 0000000000..0bde0fc62f --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/fvSolution @@ -0,0 +1 @@ +../heater/fvSolution \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict new file mode 100644 index 0000000000..c24aa9244d --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict @@ -0,0 +1,322 @@ +FoamFile +{ + version 2.0; + format ascii; + + root "/home/warhol/chris/foam/chris2.1/run/tutorials/interFoam"; + case "damBreak"; + instance "system"; + local ""; + + class dictionary; + object changePatchTypeDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +dictionaryReplacement +{ + U + { + internalField uniform ( 0.01 0 0 ); + boundaryField + { + minX + { + type fixedValue; + value uniform (0.01 0 0); + } + maxX + { + type inletOutlet; + inletValue uniform (0 0 0); + } + + + topAir_to_leftSolid + { + type fixedValue; + value uniform (0 0 0); + + } + topAir_to_heater + { + type fixedValue; + value uniform (0 0 0); + } + topAir_to_rightSolid + { + type fixedValue; + value uniform (0 0 0); + } + } + } + + + + T + { + boundaryField + { + minX + { + type fixedValue; + value uniform 300; + } + topAir_to_leftSolid + { + type solidWallTemperatureCoupled; + neighbourRegionName leftSolid; + neighbourPatchName leftSolid_to_topAir; + neighbourFieldName T; + K K; + value uniform 300; + + } + topAir_to_heater + { + type solidWallTemperatureCoupled; + neighbourRegionName heater; + neighbourPatchName heater_to_topAir; + neighbourFieldName T; + K K; + value uniform 300; + } + topAir_to_rightSolid + { + type solidWallTemperatureCoupled; + neighbourRegionName rightSolid; + neighbourPatchName rightSolid_to_topAir; + neighbourFieldName T; + K K; + value uniform 300; + } + } + } + + + epsilon + { + // Set the value on all bc to non-zero. Not used in simulation + // since zeroGradient; only used in initialisation. + boundaryField + { + minX + { + type fixedValue; + value uniform 0.01; + } + maxX + { + type zeroGradient; + value uniform 0.01; + } + + minY + { + type zeroGradient; + value uniform 0.01; + } + maxY + { + type zeroGradient; + value uniform 0.01; + } + + minZ + { + type zeroGradient; + value uniform 0.01; + } + maxZ + { + type zeroGradient; + value uniform 0.01; + } + topAir_to_leftSolid + { + type zeroGradient; + value uniform 0.01; + } + topAir_to_heater + { + type zeroGradient; + value uniform 0.01; + } + topAir_to_rightSolid + { + type zeroGradient; + value uniform 0.01; + } + } + } + + + k + { + internalField uniform 0.1; + boundaryField + { + minX + { + type fixedValue; + value uniform 0.1; + } + + maxX + { + type zeroGradient; + value uniform 0.1; + } + + minY + { + type zeroGradient; + value uniform 0.1; + } + maxY + { + type zeroGradient; + value uniform 0.1; + } + + minZ + { + type zeroGradient; + value uniform 0.1; + } + maxZ + { + type zeroGradient; + value uniform 0.1; + } + + topAir_to_leftSolid + { + type zeroGradient; + value uniform 0.1; + } + topAir_to_heater + { + type zeroGradient; + value uniform 0.1; + } + topAir_to_rightSolid + { + type zeroGradient; + value uniform 0.1; + } + } + } + + + pd + { + boundaryField + { + minX + { + type fixedFluxBuoyantPressure; + value 0; + } + maxX + { + type waveTransmissive; + field pd; + phi phi; + rho rho; + psi psi; + gamma 1.4; // cp/cv + fieldInf 0; + lInf 0.40; // double length of domain + value uniform 0; + } + + minY + { + type fixedFluxBuoyantPressure; + value 0; + } + + minZ + { + type fixedFluxBuoyantPressure; + value 0; + } + maxZ + { + type fixedFluxBuoyantPressure; + value 0; + } + + topAir_to_leftSolid + { + type fixedFluxBuoyantPressure; + value 0; + } + topAir_to_heater + { + type fixedFluxBuoyantPressure; + value 0; + } + topAir_to_rightSolid + { + type fixedFluxBuoyantPressure; + value 0; + } + } + } + + p + { + internalField uniform 1000000; + + boundaryField + { + minX + { + type calculated; + value uniform 1000000; + } + maxX + { + type calculated; + value uniform 1000000; + } + maxY + { + type calculated; + value uniform 1000000; + } + minZ + { + type calculated; + value uniform 1000000; + } + maxZ + { + type calculated; + value uniform 1000000; + } + + topAir_to_leftSolid + { + type calculated; + value uniform 1000000; + } + topAir_to_heater + { + type calculated; + value uniform 1000000; + } + topAir_to_rightSolid + { + type calculated; + value uniform 1000000; + } + } + } +} + +// ************************************************************************* // diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes new file mode 120000 index 0000000000..ff6aeb82d3 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes @@ -0,0 +1 @@ +../bottomAir/fvSchemes \ No newline at end of file diff --git a/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution new file mode 120000 index 0000000000..745b2bcfe4 --- /dev/null +++ b/tutorials/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSolution @@ -0,0 +1 @@ +../bottomAir/fvSolution \ No newline at end of file From ce66358a575011bb3ffc4dfab34a9cb758a1992f Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 17 Jul 2008 14:15:43 +0100 Subject: [PATCH 11/11] cyclic ordering fix --- .../constraint/cyclic/cyclicPolyPatch.C | 59 +++++++++++-------- .../constraint/cyclic/cyclicPolyPatch.H | 15 ++--- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C index e753d53d8a..b1cd7a02f6 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C @@ -60,27 +60,35 @@ const NamedEnum // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +Foam::label Foam::cyclicPolyPatch::findMaxArea +( + const pointField& points, + const faceList& faces +) +{ + label maxI = -1; + scalar maxAreaSqr = -GREAT; + + forAll(faces, faceI) + { + scalar areaSqr = magSqr(faces[faceI].normal(points)); + + if (areaSqr > maxAreaSqr) + { + maxAreaSqr = areaSqr; + maxI = faceI; + } + } + return maxI; +} + + void Foam::cyclicPolyPatch::calcTransforms() { if (size() > 0) { const pointField& points = this->points(); - maxI_ = -1; - scalar maxAreaSqr = -GREAT; - - for (label faceI = 0; faceI < size()/2; faceI++) - { - const face& f = operator[](faceI); - scalar areaSqr = magSqr(f.normal(points)); - - if (areaSqr > maxAreaSqr) - { - maxAreaSqr = areaSqr; - maxI_ = faceI; - } - } - primitivePatch half0 ( SubList @@ -369,6 +377,9 @@ bool Foam::cyclicPolyPatch::getGeometricHalves } +// Given a split of faces into left and right half calculate the centres +// and anchor points. Transform the left points so they align with the +// right ones. void Foam::cyclicPolyPatch::getCentresAndAnchors ( const primitivePatch& pp, @@ -403,11 +414,17 @@ void Foam::cyclicPolyPatch::getCentresAndAnchors } default: { - // Assumes that cyclic is correctly ordered, so that face[maxI_] - // on each side is equivalent. - n0 = half0Faces[maxI_].normal(pp.points()); + // Assumes that cyclic is planar. This is also the initial + // condition for patches without faces. + + // Determine the face with max area on both halves. These + // two faces are used to determine the transformation tensors + label max0I = findMaxArea(pp.points(), half0Faces); + n0 = half0Faces[max0I].normal(pp.points()); n0 /= mag(n0) + VSMALL; - n1 = half1Faces[maxI_].normal(pp.points()); + + label max1I = findMaxArea(pp.points(), half1Faces); + n1 = half1Faces[max1I].normal(pp.points()); n1 /= mag(n1) + VSMALL; } } @@ -596,7 +613,6 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPointsPtr_(NULL), coupledEdgesPtr_(NULL), featureCos_(0.9), - maxI_(-1), transform_(UNKNOWN), rotationAxis_(vector::zero), rotationCentre_(point::zero) @@ -617,7 +633,6 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPointsPtr_(NULL), coupledEdgesPtr_(NULL), featureCos_(0.9), - maxI_(-1), transform_(UNKNOWN), rotationAxis_(vector::zero), rotationCentre_(point::zero) @@ -658,7 +673,6 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPointsPtr_(NULL), coupledEdgesPtr_(NULL), featureCos_(pp.featureCos_), - maxI_(pp.maxI_), transform_(pp.transform_), rotationAxis_(pp.rotationAxis_), rotationCentre_(pp.rotationCentre_) @@ -680,7 +694,6 @@ Foam::cyclicPolyPatch::cyclicPolyPatch coupledPointsPtr_(NULL), coupledEdgesPtr_(NULL), featureCos_(pp.featureCos_), - maxI_(pp.maxI_), transform_(pp.transform_), rotationAxis_(pp.rotationAxis_), rotationCentre_(pp.rotationCentre_) diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H index 418dbcb003..f9c4e66dbb 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H @@ -98,9 +98,6 @@ private: // Used to split cyclic into halves. scalar featureCos_; - //- Index of largest cell face - label maxI_; - //- Type of transformation - rotational or translational transformType transform_; @@ -113,8 +110,12 @@ private: // Private member functions + //- Find amongst selected faces the one with the largest area + static label findMaxArea(const pointField&, const faceList&); + void calcTransforms(); + // Face ordering //- Find the two parts of the faces of pp using feature edges. @@ -169,16 +170,16 @@ protected: // Protected Member functions //- Initialise the calculation of the patch geometry - void initGeometry(); + virtual void initGeometry(); //- Calculate the patch geometry - void calcGeometry(); + virtual void calcGeometry(); //- Initialise the patches for moving points - void initMovePoints(const pointField&); + virtual void initMovePoints(const pointField&); //- Correct patches after moving points - void movePoints(const pointField&); + virtual void movePoints(const pointField&); //- Initialise the update of the patch topology virtual void initUpdateMesh();