From 7dee8058e1ea7d3230d392b435b571f333e5317d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 30 Mar 2011 09:22:01 +0200 Subject: [PATCH 01/36] ENH: add Gcc46 rules --- etc/bashrc | 2 +- etc/cshrc | 2 +- etc/settings.csh | 7 +++++++ etc/settings.sh | 6 ++++++ wmake/rules/linux64Gcc46/c | 16 ++++++++++++++++ wmake/rules/linux64Gcc46/c++ | 21 +++++++++++++++++++++ wmake/rules/linux64Gcc46/c++Debug | 2 ++ wmake/rules/linux64Gcc46/c++Opt | 4 ++++ wmake/rules/linux64Gcc46/c++Prof | 2 ++ wmake/rules/linux64Gcc46/cDebug | 2 ++ wmake/rules/linux64Gcc46/cOpt | 2 ++ wmake/rules/linux64Gcc46/cProf | 2 ++ wmake/rules/linux64Gcc46/general | 8 ++++++++ wmake/rules/linux64Gcc46/mplibHPMPI | 3 +++ wmake/rules/linuxGcc46/c | 16 ++++++++++++++++ wmake/rules/linuxGcc46/c++ | 21 +++++++++++++++++++++ wmake/rules/linuxGcc46/c++Debug | 2 ++ wmake/rules/linuxGcc46/c++Opt | 2 ++ wmake/rules/linuxGcc46/c++Prof | 2 ++ wmake/rules/linuxGcc46/cDebug | 2 ++ wmake/rules/linuxGcc46/cOpt | 2 ++ wmake/rules/linuxGcc46/cProf | 2 ++ wmake/rules/linuxGcc46/general | 9 +++++++++ wmake/rules/linuxGcc46/mplibHPMPI | 3 +++ 24 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 wmake/rules/linux64Gcc46/c create mode 100644 wmake/rules/linux64Gcc46/c++ create mode 100644 wmake/rules/linux64Gcc46/c++Debug create mode 100644 wmake/rules/linux64Gcc46/c++Opt create mode 100644 wmake/rules/linux64Gcc46/c++Prof create mode 100644 wmake/rules/linux64Gcc46/cDebug create mode 100644 wmake/rules/linux64Gcc46/cOpt create mode 100644 wmake/rules/linux64Gcc46/cProf create mode 100644 wmake/rules/linux64Gcc46/general create mode 100644 wmake/rules/linux64Gcc46/mplibHPMPI create mode 100644 wmake/rules/linuxGcc46/c create mode 100644 wmake/rules/linuxGcc46/c++ create mode 100644 wmake/rules/linuxGcc46/c++Debug create mode 100644 wmake/rules/linuxGcc46/c++Opt create mode 100644 wmake/rules/linuxGcc46/c++Prof create mode 100644 wmake/rules/linuxGcc46/cDebug create mode 100644 wmake/rules/linuxGcc46/cOpt create mode 100644 wmake/rules/linuxGcc46/cProf create mode 100644 wmake/rules/linuxGcc46/general create mode 100644 wmake/rules/linuxGcc46/mplibHPMPI diff --git a/etc/bashrc b/etc/bashrc index f5a29a3d89..2de27d0513 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -62,7 +62,7 @@ foamInstall=$HOME/$WM_PROJECT foamCompiler=system #- Compiler: -# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Clang | Icc (Intel icc) +# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc) export WM_COMPILER=Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH diff --git a/etc/cshrc b/etc/cshrc index b932679ad0..a23a607fff 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -61,7 +61,7 @@ if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall set foamCompiler=system #- Compiler: -# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Clang | Icc (Intel icc) +# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Gcc46 | Clang | Icc (Intel icc) setenv WM_COMPILER Gcc setenv WM_COMPILER_ARCH # defined but empty unsetenv WM_COMPILER_LIB_ARCH diff --git a/etc/settings.csh b/etc/settings.csh index 4e5677e3d9..5e4c849926 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -207,6 +207,13 @@ case ThirdParty: set gmp_version=gmp-5.0.1 set mpfr_version=mpfr-2.4.2 breaksw + case Gcc46: + case Gcc46++0x: + set gcc_version=gcc-4.6.0 + set gmp_version=gmp-5.0.1 + set mpfr_version=mpfr-2.4.2 + set mpc_version=mpc-0.8.1 + breaksw case Gcc45: case Gcc45++0x: set gcc_version=gcc-4.5.2 diff --git a/etc/settings.sh b/etc/settings.sh index d7fcf2e254..f9f83e42a4 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -227,6 +227,12 @@ OpenFOAM | ThirdParty) gmp_version=gmp-5.0.1 mpfr_version=mpfr-2.4.2 ;; + Gcc46 | Gcc46++0x) + gcc_version=gcc-4.6.0 + gmp_version=gmp-5.0.1 + mpfr_version=mpfr-2.4.2 + mpc_version=mpc-0.8.1 + ;; Gcc45 | Gcc45++0x) gcc_version=gcc-4.5.2 gmp_version=gmp-5.0.1 diff --git a/wmake/rules/linux64Gcc46/c b/wmake/rules/linux64Gcc46/c new file mode 100644 index 0000000000..f4114be314 --- /dev/null +++ b/wmake/rules/linux64Gcc46/c @@ -0,0 +1,16 @@ +.SUFFIXES: .c .h + +cWARN = -Wall + +cc = gcc -m64 + +include $(RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Gcc46/c++ b/wmake/rules/linux64Gcc46/c++ new file mode 100644 index 0000000000..3ca193e296 --- /dev/null +++ b/wmake/rules/linux64Gcc46/c++ @@ -0,0 +1,21 @@ +.SUFFIXES: .C .cxx .cc .cpp + +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast + +CC = g++ -m64 + +include $(RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linux64Gcc46/c++Debug b/wmake/rules/linux64Gcc46/c++Debug new file mode 100644 index 0000000000..19bdb9c334 --- /dev/null +++ b/wmake/rules/linux64Gcc46/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -ggdb3 -DFULLDEBUG +c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc46/c++Opt b/wmake/rules/linux64Gcc46/c++Opt new file mode 100644 index 0000000000..3446f7f58c --- /dev/null +++ b/wmake/rules/linux64Gcc46/c++Opt @@ -0,0 +1,4 @@ +c++DBUG = +c++OPT = -O3 +#c++OPT = -march=nocona -O3 +# -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/linux64Gcc46/c++Prof b/wmake/rules/linux64Gcc46/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linux64Gcc46/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linux64Gcc46/cDebug b/wmake/rules/linux64Gcc46/cDebug new file mode 100644 index 0000000000..72b638f458 --- /dev/null +++ b/wmake/rules/linux64Gcc46/cDebug @@ -0,0 +1,2 @@ +cDBUG = -ggdb -DFULLDEBUG +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linux64Gcc46/cOpt b/wmake/rules/linux64Gcc46/cOpt new file mode 100644 index 0000000000..17318709f1 --- /dev/null +++ b/wmake/rules/linux64Gcc46/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 diff --git a/wmake/rules/linux64Gcc46/cProf b/wmake/rules/linux64Gcc46/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linux64Gcc46/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linux64Gcc46/general b/wmake/rules/linux64Gcc46/general new file mode 100644 index 0000000000..4a42b11b1e --- /dev/null +++ b/wmake/rules/linux64Gcc46/general @@ -0,0 +1,8 @@ +CPP = cpp -traditional-cpp + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(RULES)/c +include $(RULES)/c++ diff --git a/wmake/rules/linux64Gcc46/mplibHPMPI b/wmake/rules/linux64Gcc46/mplibHPMPI new file mode 100644 index 0000000000..574492a236 --- /dev/null +++ b/wmake/rules/linux64Gcc46/mplibHPMPI @@ -0,0 +1,3 @@ +PFLAGS = +PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H +PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi diff --git a/wmake/rules/linuxGcc46/c b/wmake/rules/linuxGcc46/c new file mode 100644 index 0000000000..d914fcd37d --- /dev/null +++ b/wmake/rules/linuxGcc46/c @@ -0,0 +1,16 @@ +.SUFFIXES: .c .h + +cWARN = -Wall + +cc = gcc -m32 + +include $(RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxGcc46/c++ b/wmake/rules/linuxGcc46/c++ new file mode 100644 index 0000000000..e862181fc5 --- /dev/null +++ b/wmake/rules/linuxGcc46/c++ @@ -0,0 +1,21 @@ +.SUFFIXES: .C .cxx .cc .cpp + +c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast + +CC = g++ -m32 + +include $(RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linuxGcc46/c++Debug b/wmake/rules/linuxGcc46/c++Debug new file mode 100644 index 0000000000..19bdb9c334 --- /dev/null +++ b/wmake/rules/linuxGcc46/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -ggdb3 -DFULLDEBUG +c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxGcc46/c++Opt b/wmake/rules/linuxGcc46/c++Opt new file mode 100644 index 0000000000..2aedabd628 --- /dev/null +++ b/wmake/rules/linuxGcc46/c++Opt @@ -0,0 +1,2 @@ +c++DBUG = +c++OPT = -O3 diff --git a/wmake/rules/linuxGcc46/c++Prof b/wmake/rules/linuxGcc46/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linuxGcc46/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linuxGcc46/cDebug b/wmake/rules/linuxGcc46/cDebug new file mode 100644 index 0000000000..72b638f458 --- /dev/null +++ b/wmake/rules/linuxGcc46/cDebug @@ -0,0 +1,2 @@ +cDBUG = -ggdb -DFULLDEBUG +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxGcc46/cOpt b/wmake/rules/linuxGcc46/cOpt new file mode 100644 index 0000000000..17318709f1 --- /dev/null +++ b/wmake/rules/linuxGcc46/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 diff --git a/wmake/rules/linuxGcc46/cProf b/wmake/rules/linuxGcc46/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linuxGcc46/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linuxGcc46/general b/wmake/rules/linuxGcc46/general new file mode 100644 index 0000000000..4b051e6b98 --- /dev/null +++ b/wmake/rules/linuxGcc46/general @@ -0,0 +1,9 @@ +CPP = cpp -traditional-cpp +LD = ld -melf_i386 + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(RULES)/c +include $(RULES)/c++ diff --git a/wmake/rules/linuxGcc46/mplibHPMPI b/wmake/rules/linuxGcc46/mplibHPMPI new file mode 100644 index 0000000000..8aff40632b --- /dev/null +++ b/wmake/rules/linuxGcc46/mplibHPMPI @@ -0,0 +1,3 @@ +PFLAGS = +PINC = -I$(MPI_ARCH_PATH)/include -D_MPICC_H +PLIBS = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi From 31cea7cb8fff66af50d2a75ef5b3e4d8794e3400 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 30 Mar 2011 16:47:03 +0100 Subject: [PATCH 02/36] STYLE: treeData*: renamed points() to shapePoints() to avoid confusion --- src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C | 2 +- src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H | 2 +- src/OpenFOAM/meshes/polyMesh/polyMesh.C | 2 ++ src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C | 2 ++ src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H | 6 ++++-- src/meshTools/indexedOctree/treeDataEdge.C | 4 ++-- src/meshTools/indexedOctree/treeDataEdge.H | 4 ++-- src/meshTools/indexedOctree/treeDataFace.C | 4 ++-- src/meshTools/indexedOctree/treeDataFace.H | 4 ++-- src/meshTools/indexedOctree/treeDataPoint.C | 2 +- src/meshTools/indexedOctree/treeDataPoint.H | 7 ++++++- src/meshTools/indexedOctree/treeDataPrimitivePatch.C | 4 ++-- src/meshTools/indexedOctree/treeDataPrimitivePatch.H | 4 ++-- src/meshTools/indexedOctree/treeDataTriSurface.C | 4 ++-- src/meshTools/indexedOctree/treeDataTriSurface.H | 4 ++-- 15 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C index c528f8fa16..0ea4168bd2 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.C @@ -126,7 +126,7 @@ Foam::treeDataCell::treeDataCell // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::pointField Foam::treeDataCell::points() const +Foam::pointField Foam::treeDataCell::shapePoints() const { pointField cc(cellLabels_.size()); diff --git a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H index 7cebddafa9..0e55f5168a 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H +++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataCell.H @@ -125,7 +125,7 @@ public: //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C index 9891c79e5b..4c08d917e7 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C @@ -34,6 +34,8 @@ License #include "OSspecific.H" #include "demandDrivenData.H" #include "polyMeshTetDecomposition.H" +#include "indexedOctree.H" +#include "treeDataCell.H" #include "pointMesh.H" diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C index b0e83ce670..d14807abf8 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C @@ -25,6 +25,8 @@ License #include "primitiveMesh.H" #include "demandDrivenData.H" +#include "indexedOctree.H" +#include "treeDataCell.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H index cc3bc2c80a..92937ed158 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H @@ -67,14 +67,16 @@ SourceFiles #include "Map.H" #include "EdgeMap.H" #include "boundBox.H" -#include "indexedOctree.H" -#include "treeDataCell.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { +// Forward declaration of classes +class treeDataCell; +template class indexedOctree; + /*---------------------------------------------------------------------------*\ Class primitiveMesh Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C index 3146bcd4d4..2dab1ce1e6 100644 --- a/src/meshTools/indexedOctree/treeDataEdge.C +++ b/src/meshTools/indexedOctree/treeDataEdge.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ Foam::treeDataEdge::treeDataEdge // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::pointField Foam::treeDataEdge::points() const +Foam::pointField Foam::treeDataEdge::shapePoints() const { pointField eMids(edgeLabels_.size()); diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/meshTools/indexedOctree/treeDataEdge.H index 635babcf61..9a4864783f 100644 --- a/src/meshTools/indexedOctree/treeDataEdge.H +++ b/src/meshTools/indexedOctree/treeDataEdge.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ public: //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C index 66d6feec71..5afdfc98b4 100644 --- a/src/meshTools/indexedOctree/treeDataFace.C +++ b/src/meshTools/indexedOctree/treeDataFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,7 @@ Foam::treeDataFace::treeDataFace // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::pointField Foam::treeDataFace::points() const +Foam::pointField Foam::treeDataFace::shapePoints() const { pointField cc(faceLabels_.size()); diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H index 89ed27e24b..71a08887ba 100644 --- a/src/meshTools/indexedOctree/treeDataFace.H +++ b/src/meshTools/indexedOctree/treeDataFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,7 @@ public: //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C index cabc1acf7f..1685b3b4e9 100644 --- a/src/meshTools/indexedOctree/treeDataPoint.C +++ b/src/meshTools/indexedOctree/treeDataPoint.C @@ -54,7 +54,7 @@ Foam::treeDataPoint::treeDataPoint // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::pointField Foam::treeDataPoint::points() const +Foam::pointField Foam::treeDataPoint::shapePoints() const { if (pointLabels_.size()) { diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H index 4f67b15a3f..291927625c 100644 --- a/src/meshTools/indexedOctree/treeDataPoint.H +++ b/src/meshTools/indexedOctree/treeDataPoint.H @@ -94,9 +94,14 @@ public: return pointLabels_; } + const pointField& points() const + { + return points_; + } + //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C index 87f033d3a3..e6b485d6f4 100644 --- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C +++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ template > Foam::pointField Foam::treeDataPrimitivePatch:: -points() const +shapePoints() const { pointField cc(patch_.size()); diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H index 5c098d0be8..b87514a4a2 100644 --- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H +++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,7 +118,7 @@ public: //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C index 3e515cf699..63c76de482 100644 --- a/src/meshTools/indexedOctree/treeDataTriSurface.C +++ b/src/meshTools/indexedOctree/treeDataTriSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -187,7 +187,7 @@ Foam::treeDataTriSurface::treeDataTriSurface(const triSurface& surface) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::pointField Foam::treeDataTriSurface::points() const +Foam::pointField Foam::treeDataTriSurface::shapePoints() const { const pointField& points = surface_.points(); diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.H b/src/meshTools/indexedOctree/treeDataTriSurface.H index 377294dcbd..47778c61c5 100644 --- a/src/meshTools/indexedOctree/treeDataTriSurface.H +++ b/src/meshTools/indexedOctree/treeDataTriSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,7 +103,7 @@ public: //- Get representative point cloud for all shapes inside // (one point per shape) - pointField points() const; + pointField shapePoints() const; // Search From 0b8d3b2660b1ec9380b6343c9069133ee3deecc8 Mon Sep 17 00:00:00 2001 From: graham Date: Thu, 31 Mar 2011 11:17:58 +0100 Subject: [PATCH 03/36] ENH: Shorten run - flow chokes. --- .../hopperEmptying/system/controlDict | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict index 5aee7b41b0..7feb2b4eb3 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopperEmptying/system/controlDict @@ -23,13 +23,13 @@ startTime 0; stopAt endTime; -endTime 15; +endTime 5; deltaT 5e-5; writeControl runTime; -writeInterval 0.05; +writeInterval 0.02; purgeWrite 0; From 4a2e3fb5a27afbdaef3e993d5ebaeb2c40645d2b Mon Sep 17 00:00:00 2001 From: graham Date: Thu, 31 Mar 2011 11:53:51 +0100 Subject: [PATCH 04/36] BUG: Copying field instead of taking reference. --- .../functionObjects/utilities/dsmcFields/IOdsmcFields.C | 2 +- .../functionObjects/utilities/dsmcFields/dsmcFields.C | 4 ++-- .../functionObjects/utilities/dsmcFields/dsmcFields.H | 2 +- .../utilities/dsmcFields/dsmcFieldsFunctionObject.C | 2 +- .../utilities/dsmcFields/dsmcFieldsFunctionObject.H | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C index 9c9e87e9c2..60dc0f88a4 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/IOdsmcFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C index 6d9dec61ef..5a6e614c0b 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -143,7 +143,7 @@ void Foam::dsmcFields::write() iDofMeanName ); - volVectorField fDMean = obr_.lookupObject + const volVectorField& fDMean = obr_.lookupObject ( fDMeanName ); diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H index 34afc2f8eb..b18ec3c92c 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C index 92cbea8eff..092bb09b3c 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H index 6dbcf4ee02..86280aff2e 100644 --- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H +++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFieldsFunctionObject.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 3c2c3650d4bba92c2cb05ed931b2cae9db4faf95 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 11:55:41 +0100 Subject: [PATCH 05/36] LTSInterFoam, rhoPorousMRFLTSPimpleFoam: set the name of the old-time rDeltaT to avoid the registration of rDeltaT being pinched --- .../rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H | 2 +- .../solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H index 80ccb1a560..e854f03d35 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/setrDeltaT.H @@ -19,7 +19,7 @@ pimple.lookupOrDefault("maxDeltaT", GREAT) ); - volScalarField rDeltaT0 = rDeltaT; + volScalarField rDeltaT0("rDeltaT0", rDeltaT); // Set the reciprocal time-step from the local Courant number rDeltaT.dimensionedInternalField() = max diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H index 1e8d8da3e7..b296187e9e 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/setrDeltaT.H @@ -49,7 +49,7 @@ piso.lookupOrDefault("maxDeltaT", GREAT) ); - volScalarField rDeltaT0 = rDeltaT; + volScalarField rDeltaT0("rDeltaT0", rDeltaT); // Set the reciprocal time-step from the local Courant number rDeltaT.dimensionedInternalField() = max From b8839a7ba64fb8b6755abca37850b1d3b03140b9 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 11:56:33 +0100 Subject: [PATCH 06/36] Intel icpc compiler: made a few random changes to keep the Intel compiler happy --- .../Lists/PackedList/PackedBoolList.C | 2 +- .../Lists/PackedList/PackedBoolList.H | 2 +- .../Lists/PackedList/PackedBoolListI.H | 2 +- .../IOobjects/CompactIOField/CompactIOField.H | 21 +------------------ .../db/IOobjects/IOdictionary/IOdictionary.C | 6 ++---- .../fields/Fields/DynamicField/DynamicField.H | 18 +--------------- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 2 +- 7 files changed, 8 insertions(+), 45 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C index 94d6308658..3b51bc10ff 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C @@ -287,7 +287,7 @@ Foam::Xfer Foam::PackedBoolList::used() const // * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * // Foam::PackedBoolList& -Foam::PackedBoolList::operator=(const UList& lst) +Foam::PackedBoolList::operator=(const Foam::UList& lst) { this->setSize(lst.size()); diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H index f9948d719a..697c7983c1 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H @@ -115,7 +115,7 @@ public: inline PackedBoolList(const Xfer >&); //- Construct from a list of bools - explicit inline PackedBoolList(const UList&); + explicit inline PackedBoolList(const Foam::UList&); //- Construct from a list of labels // using the labels as indices to indicate which bits are set diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H index 219fb79b37..f781b7370f 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H @@ -73,7 +73,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer >& lst) {} -inline Foam::PackedBoolList::PackedBoolList(const UList& lst) +inline Foam::PackedBoolList::PackedBoolList(const Foam::UList& lst) : PackedList<1>() { diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H index f7622cae55..ffd2dcd21b 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H @@ -47,9 +47,6 @@ SourceFiles namespace Foam { -class Istream; -class Ostream; - // Forward declaration of friend functions and operators template class CompactIOField; @@ -58,6 +55,7 @@ template Istream& operator>> Istream&, CompactIOField& ); + template Ostream& operator<< ( Ostream&, @@ -122,23 +120,6 @@ public: void operator=(const CompactIOField&); void operator=(const Field&); - - - // IOstream operators - - //- Read Field from Istream, discarding contents of existing Field. - friend Istream& operator>> - ( - Istream&, - CompactIOField& - ); - - // Write Field to Ostream. - friend Ostream& operator<< - ( - Ostream&, - const CompactIOField& - ); }; diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C index 0954a23a7e..2c5087c120 100644 --- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C +++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C @@ -124,16 +124,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io) regIOobject(io) { // Temporary warning - if (io.readOpt() == IOobject::MUST_READ) + if (debug && io.readOpt() == IOobject::MUST_READ) { WarningIn("IOdictionary::IOdictionary(const IOobject&)") - //FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)") << "Dictionary " << name() << " constructed with IOobject::MUST_READ" " instead of IOobject::MUST_READ_IF_MODIFIED." << nl << "Use MUST_READ_IF_MODIFIED if you need automatic rereading." << endl; - //<< abort(FatalError); } // Everyone check or just master @@ -182,7 +180,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict) regIOobject(io) { // Temporary warning - if (io.readOpt() == IOobject::MUST_READ) + if (debug && io.readOpt() == IOobject::MUST_READ) { WarningIn ( diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index e1870f4f47..bafba9f877 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -55,6 +55,7 @@ Ostream& operator<< Ostream&, const DynamicField& ); + template Istream& operator>> ( @@ -234,23 +235,6 @@ public: //- Assignment from UList inline void operator=(const UList&); - - - // IOstream operators - - // Write DynamicField to Ostream. - friend Ostream& operator<< - ( - Ostream&, - const DynamicField& - ); - - //- Read from Istream, discarding contents of existing DynamicField. - friend Istream& operator>> - ( - Istream&, - DynamicField& - ); }; diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C index 7478de9c9a..414e113ec8 100644 --- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C +++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C @@ -282,7 +282,7 @@ Foam::label Foam::ptscotchDecomp::decomposeZeroDomains << ( cWeights.size() - ? scalarField::subField(cWeights, nCells, startCell) + ? static_cast(scalarField::subField(cWeights, nCells, startCell)) : scalarField(0) ); From 1bc5ac6d7d14f3ff223c6ad7585bece0c836dab6 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 11:59:42 +0100 Subject: [PATCH 07/36] Updated date --- src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C | 2 +- src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H | 2 +- src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H | 2 +- src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C index 3b51bc10ff..550e6caf2b 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H index f781b7370f..c5a4770bb3 100644 --- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H +++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H index ffd2dcd21b..3bf061522f 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index bafba9f877..5069408597 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From fe99873a105965d0950649ec57711d2c15c0eb69 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 12:00:45 +0100 Subject: [PATCH 08/36] Corrected line length --- src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C index 414e113ec8..5083bb0e89 100644 --- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C +++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C @@ -282,7 +282,10 @@ Foam::label Foam::ptscotchDecomp::decomposeZeroDomains << ( cWeights.size() - ? static_cast(scalarField::subField(cWeights, nCells, startCell)) + ? static_cast + ( + scalarField::subField(cWeights, nCells, startCell) + ) : scalarField(0) ); From 3177e81566e39512f6ba5bd115a1c291a67e432a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 31 Mar 2011 13:53:48 +0200 Subject: [PATCH 09/36] ENH: adjust thermalPorousZone to match documentation eg, dictionary entry: thermalModel { type none; // fixedTemperature; // fixedTemperature coefficients T 350; } A missing thermalModel is treated as 'none' --- .../cfdTools/general/porousMedia/porousZone.C | 9 ++++++++- .../fixedTemperature/fixedTemperature.C | 6 +++--- .../fixedTemperature/fixedTemperature.H | 5 ++--- .../thermalModel/noThermalModel/noThermalModel.H | 5 ++--- .../thermalModel/thermalModel/thermalModel.C | 8 ++++---- .../thermalModel/thermalModel/thermalModel.H | 14 +++++++------- .../thermalModel/thermalModel/thermalModelNew.C | 10 ++++++++-- .../thermalPorousZone/thermalPorousZone.C | 7 +++++-- .../thermalPorousZone/thermalPorousZone.H | 4 ++-- .../thermalPorousZone/thermalPorousZones.C | 2 +- .../thermalPorousZone/thermalPorousZones.H | 7 ++++--- .../angledDuctImplicit/constant/porousZones | 9 +++++---- 12 files changed, 51 insertions(+), 35 deletions(-) diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C index cdce53e932..97fe34d586 100644 --- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C +++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -445,6 +445,13 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const dictPtr->write(os); } + // thermalModel + if (const dictionary* dictPtr = dict_.subDictPtr("thermalModel")) + { + os << indent << "thermalModel"; + dictPtr->write(os); + } + os << decrIndent << indent << token::END_BLOCK << endl; } diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C index dba5a3d470..4f75d3ee13 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,8 +51,8 @@ namespace porousMedia Foam::porousMedia::fixedTemperature::fixedTemperature(const porousZone& pZone) : - thermalModel(pZone, typeName), - T_(readScalar(coeffDict_.lookup("T"))) + thermalModel(pZone), + T_(readScalar(thermalCoeffs_.lookup("T"))) {} diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H index 4ae9aab656..5498cf7b90 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,6 @@ Description #define fixedTemperature_H #include "thermalModel.H" -#include "autoPtr.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,7 +80,7 @@ public: //- Add the thermal source to the enthalpy equation virtual void addEnthalpySource ( - const basicThermo& thermo, + const basicThermo&, const volScalarField& rho, fvScalarMatrix& hEqn ) const; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H index 123a9b2fd5..4f6df99852 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,6 @@ Description #define noThermalModel_H #include "thermalModel.H" -#include "autoPtr.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -73,7 +72,7 @@ public: //- Add the thermal source to the enthalpy equation virtual void addEnthalpySource ( - const basicThermo& thermo, + const basicThermo&, const volScalarField& rho, fvScalarMatrix& hEqn ) const; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C index d7e36c8ed8..36d06cf91e 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,18 +42,18 @@ namespace porousMedia Foam::porousMedia::thermalModel::thermalModel(const porousZone& pZone) : pZone_(pZone), - coeffDict_(dictionary::null) + thermalCoeffs_(pZone.dict().subDictPtr("thermalModel")) {} Foam::porousMedia::thermalModel::thermalModel ( const porousZone& pZone, - const word& modelType + const dictionary& thermalCoeffs ) : pZone_(pZone), - coeffDict_(pZone_.dict().subDict(modelType + "Coeffs")) + thermalCoeffs_(thermalCoeffs) {} diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H index bda42db68e..a4f762c285 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,8 +63,8 @@ protected: //- Reference to the porous zone const porousZone& pZone_; - //- Sub-model coefficients dictionary - const dictionary coeffDict_; + //- Thermal model coefficients dictionary + const dictionary thermalCoeffs_; public: @@ -87,11 +87,11 @@ public: // Constructors - //- Construct null from porous zone + //- Construct from porous zone, coefficients from "thermalModel" entry thermalModel(const porousZone&); - //- Construct from porous zone and model type name - thermalModel(const porousZone&, const word& modelType); + //- Construct from porous zone and thermal model coefficients + thermalModel(const porousZone&, const dictionary& thermalCoeffs); //- Destructor @@ -107,7 +107,7 @@ public: //- Add the thermal source to the enthalpy equation virtual void addEnthalpySource ( - const basicThermo& thermo, + const basicThermo&, const volScalarField& rho, fvScalarMatrix& hEqn ) const = 0; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C index 8b89b7eef1..731fdeac4a 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,13 @@ Foam::porousMedia::thermalModel::New const porousZone& pZone ) { - const word modelType(pZone.dict().lookup("thermalModel")); + // a missing thermalModel is the same as type "none" + word modelType("none"); + + if (const dictionary* dictPtr = pZone.dict().subDictPtr("thermalModel")) + { + dictPtr->lookup("type") >> modelType; + } Info<< "Selecting thermalModel " << modelType << endl; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C index 9207716af5..78ab986742 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,10 @@ void Foam::thermalPorousZone::addEnthalpySource fvScalarMatrix& hEqn ) const { - model_->addEnthalpySource(thermo, rho, hEqn); + if (model_.valid()) + { + model_->addEnthalpySource(thermo, rho, hEqn); + } } diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H index 57d5e29237..ce864586f9 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -127,7 +127,7 @@ public: //- Add the thermal source to the enthalpy equation void addEnthalpySource ( - const basicThermo& thermo, + const basicThermo&, const volScalarField& rho, fvScalarMatrix& hEqn ) const; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C index a7d80ab9b1..daccc25749 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H index f30e0e50c3..2589e51ce5 100644 --- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H +++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,8 @@ Description thermalPorousZone. The input file \c constant/thermalPorousZone is implemented as - IOPtrList\ and contains the following type of data: + IOPtrList\ (but written as a dictionary) + and contains the following type of data: \verbatim 1 @@ -94,7 +95,7 @@ public: //- Add the thermal source to the enthalpy equation void addEnthalpySource ( - const basicThermo& thermo, + const basicThermo&, const volScalarField& rho, fvScalarMatrix& hEqn ) const; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones index e4d251bf9e..ef7fd5ea5e 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones @@ -31,11 +31,12 @@ FoamFile f f [0 -1 0 0 0 0 0] (0 0 0); } - thermalModel none; // fixedTemperature; - - fixedTemperatureCoeffs + thermalModel { - T 350; + type none; // fixedTemperature; + + // fixedTemperature coefficients + T 350; } } ) From e86458f8e8a09afc823dd64e55553d40f86df3b4 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 31 Mar 2011 14:19:30 +0200 Subject: [PATCH 10/36] GIT: copyright years on git push --- src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C index ef22aeee8e..c30dfd0722 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 19c08b9e5a561cae999c9d096b374fee28485392 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 15:32:07 +0100 Subject: [PATCH 11/36] tutorials: Set the file type to ascii for ascii files --- tutorials/combustion/dieselFoam/aachenBomb/0/N2 | 2 -- tutorials/combustion/dieselFoam/aachenBomb/0/alphat | 2 +- tutorials/combustion/dieselFoam/aachenBomb/0/epsilon | 2 +- tutorials/combustion/dieselFoam/aachenBomb/0/k | 2 +- tutorials/combustion/dieselFoam/aachenBomb/0/mut | 2 +- .../combustion/dieselFoam/aachenBomb/constant/RASProperties | 2 +- .../dieselFoam/aachenBomb/constant/chemistryProperties | 2 +- .../dieselFoam/aachenBomb/constant/combustionProperties | 2 +- tutorials/combustion/dieselFoam/aachenBomb/constant/g | 2 +- .../dieselFoam/aachenBomb/constant/polyMesh/boundary | 2 +- .../combustion/dieselFoam/aachenBomb/constant/sprayProperties | 2 +- .../dieselFoam/aachenBomb/constant/thermophysicalProperties | 2 +- .../dieselFoam/aachenBomb/constant/turbulenceProperties | 2 +- tutorials/combustion/dieselFoam/aachenBomb/system/controlDict | 2 +- tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes | 2 +- .../fireFoam/les/smallPoolFire2D/constant/LESProperties | 2 +- .../les/smallPoolFire2D/constant/turbulenceProperties | 2 +- .../fireFoam/les/smallPoolFire3D/constant/LESProperties | 2 +- .../les/smallPoolFire3D/constant/turbulenceProperties | 2 +- .../ras/counterFlowFlame2D/constant/chemistryProperties | 2 +- .../combustion/reactingFoam/ras/counterFlowFlame2D/constant/g | 2 +- .../ras/counterFlowFlame2D/constant/thermophysicalProperties | 2 +- .../ras/counterFlowFlame2D/constant/turbulenceProperties | 2 +- .../reactingFoam/ras/counterFlowFlame2D/system/controlDict | 2 +- .../reactingFoam/ras/counterFlowFlame2D/system/fvSchemes | 2 +- .../reactingFoam/ras/counterFlowFlame2D/system/fvSolution | 2 +- .../rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary | 2 +- .../rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon | 2 +- .../rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k | 2 +- .../rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut | 2 +- .../angledDuctImplicit/constant/RASProperties | 2 +- .../angledDuctImplicit/constant/thermophysicalProperties | 2 +- .../angledDuctImplicit/system/controlDict | 2 +- .../angledDuctImplicit/system/fvSchemes | 2 +- .../buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat | 2 +- .../hotRadiationRoomFvDOM/0/epsilon | 2 +- .../buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k | 2 +- .../buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut | 2 +- .../hotRadiationRoomFvDOM/constant/polyMesh/boundary | 2 +- .../multiRegionHeater/constant/polyMesh/boundary | 2 +- .../multiRegionLiquidHeater/constant/polyMesh/boundary | 2 +- .../pimpleDyMFoam/movingCone/constant/dynamicMeshDict | 2 +- .../pimpleDyMFoam/movingCone/constant/polyMesh/boundary | 2 +- .../pimpleDyMFoam/movingCone/system/controlDict | 2 +- .../incompressible/pimpleDyMFoam/movingCone/system/fvSchemes | 2 +- .../incompressible/pimpleDyMFoam/movingCone/system/fvSolution | 2 +- .../porousSimpleFoam/angledDuctExplicit/system/controlDict | 2 +- .../porousSimpleFoam/angledDuctExplicit/system/fvSchemes | 2 +- .../porousSimpleFoam/angledDuctExplicit/system/fvSolution | 2 +- .../porousSimpleFoam/angledDuctImplicit/0/epsilon | 2 +- .../incompressible/porousSimpleFoam/angledDuctImplicit/0/k | 2 +- .../incompressible/porousSimpleFoam/angledDuctImplicit/0/nut | 2 +- .../angledDuctImplicit/constant/RASProperties | 2 +- .../angledDuctImplicit/constant/polyMesh/boundary | 2 +- .../porousSimpleFoam/angledDuctImplicit/system/controlDict | 2 +- .../porousSimpleFoam/angledDuctImplicit/system/fvSchemes | 2 +- .../porousSimpleFoam/angledDuctImplicit/system/fvSolution | 2 +- .../counterFlowFlame2D/constant/chemistryProperties | 2 +- .../LTSReactingParcelFoam/counterFlowFlame2D/constant/g | 2 +- .../counterFlowFlame2D/constant/thermophysicalProperties | 2 +- .../counterFlowFlame2D/constant/turbulenceProperties | 2 +- .../counterFlowFlame2D/system/controlDict | 2 +- .../LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes | 2 +- .../counterFlowFlame2D/system/fvSolution | 2 +- .../LTSReactingParcelFoam/verticalChannel/system/fvSolution | 2 +- .../SnakeRiverCanyon/constant/polyMesh/boundary | 2 +- tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs | 2 +- .../cavitatingFoam/les/throttle/constant/LESProperties | 2 +- .../cavitatingFoam/les/throttle/constant/polyMesh/boundary | 2 +- .../les/throttle/constant/thermodynamicProperties | 2 +- .../cavitatingFoam/les/throttle/constant/transportProperties | 2 +- .../cavitatingFoam/les/throttle/constant/turbulenceProperties | 2 +- .../multiphase/cavitatingFoam/les/throttle/system/controlDict | 2 +- .../multiphase/cavitatingFoam/les/throttle/system/fvSchemes | 2 +- .../cavitatingFoam/les/throttle/system/refineMeshDict | 2 +- .../multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs | 2 +- tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs | 2 +- .../cavitatingFoam/les/throttle3D/constant/LESProperties | 2 +- .../cavitatingFoam/les/throttle3D/constant/polyMesh/boundary | 2 +- .../les/throttle3D/constant/thermodynamicProperties | 2 +- .../les/throttle3D/constant/transportProperties | 2 +- .../les/throttle3D/constant/turbulenceProperties | 2 +- .../cavitatingFoam/les/throttle3D/system/controlDict | 2 +- .../cavitatingFoam/les/throttle3D/system/decomposeParDict | 2 +- .../multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes | 2 +- .../cavitatingFoam/les/throttle3D/system/mapFieldsDict | 2 +- .../cavitatingFoam/les/throttle3D/system/refineMeshDict | 2 +- tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U | 2 +- .../multiphase/twoPhaseEulerFoam/bed/constant/RASProperties | 2 +- .../twoPhaseEulerFoam/bed/constant/filterProperties | 2 +- tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g | 2 +- .../twoPhaseEulerFoam/bed/constant/interfacialProperties | 2 +- .../twoPhaseEulerFoam/bed/constant/kineticTheoryProperties | 2 +- .../twoPhaseEulerFoam/bed/constant/polyMesh/boundary | 2 +- .../multiphase/twoPhaseEulerFoam/bed/constant/ppProperties | 2 +- .../twoPhaseEulerFoam/bed/constant/transportProperties | 2 +- tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict | 2 +- tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes | 2 +- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta | 2 -- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua | 4 +--- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub | 4 +--- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon | 2 -- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k | 2 -- tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p | 2 -- 104 files changed, 99 insertions(+), 113 deletions(-) diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 b/tutorials/combustion/dieselFoam/aachenBomb/0/N2 index 08371dad5f..f15397bef0 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/N2 +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/N2 @@ -18,8 +18,6 @@ dimensions [ 0 0 0 0 0 0 0 ]; internalField uniform 0.766; -referenceLevel 0; - boundaryField { walls diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat index e4dedc2b7c..158934726e 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object alphat; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon index 6f3bc5bfc6..e79c943045 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object epsilon; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index 29b4aafe91..a2c83d8347 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object k; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut index c57432b38a..5766ffb582 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object mut; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties index b94225f096..67d4d8212c 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/RASProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object RASProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties index 05e4351f94..4c5b3b3dbd 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object chemistryProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties index d8d841bc7f..e3976eaaa5 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/combustionProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object combustionProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/g b/tutorials/combustion/dieselFoam/aachenBomb/constant/g index 24985ce802..4fea433a00 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/g +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; location "constant"; object g; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary index 278bfcb94f..8983d3af9f 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index f2b0029933..f2518f15cc 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object sprayProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties index ba1621ceec..e546bd69a6 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermophysicalProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties index 8750aee18e..3e945495c5 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict index 7128224967..6499b144c0 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes index 2edee7ae63..bb1f1839fc 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes +++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties index 0f86edd2fd..44c5e02082 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/LESProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object LESProperties; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties index bc84cf9453..574f7f99b2 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/turbulenceProperties @@ -9,7 +9,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties index 7c4e03ecb0..8ba3354612 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties @@ -9,7 +9,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object LESProperties; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties index 0c81370dc6..c65786fa8f 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties index 4622143d0d..644b893310 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/chemistryProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object chemistryProperties; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g index 8bdd34c358..9dbeee70c8 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/g @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; location "constant"; object g; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties index 46a8f7a895..8d9f4ababc 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/thermophysicalProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermophysicalProperties; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties index 8750aee18e..3e945495c5 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict index b43aadad88..2ba3dc6fc5 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes index ad3d2f18ed..7d8c867cb2 100644 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution index 38b8f5dbcc..3018e06d50 100755 --- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution +++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary index 79907a046c..ae94ef4763 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon index 1ce5a12120..fda5d3374c 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object epsilon; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k index 95e46c54a8..343a33efc7 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object k; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut index 572c895347..ed07d54e7e 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object mut; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties index b94225f096..67d4d8212c 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object RASProperties; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties index 246d366f4f..686497a1c7 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermophysicalProperties; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict index 04c44d0f90..1d0a36df25 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes index a5f9ea99dd..107b8d9744 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat index 4632bd78f8..ff4f6e4dcd 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/alphat @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object alphat; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/epsilon index c1728beace..05537dc5f2 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/epsilon +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object epsilon; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k index f099e523e0..4ca80a3a44 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object k; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut index cf580731fa..f7df0f26c6 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/mut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object mut; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary index ea4babea73..a75195fd74 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary index de3fd42a4d..39c75e0d21 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary index de3fd42a4d..39c75e0d21 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict index e220ec970c..961c0d056c 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/dynamicMeshDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object dynamicMeshDict; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary index 1706b78169..20436074fd 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict index 10c6fb4a7f..02db1c83cb 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes index a2f31f5e87..3592db120c 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution index f93592537c..7bc07fa0a4 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict index 228cfac170..069e18cc87 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes index 2dc6cd1330..1d912072d2 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution index ac90027ce8..d7d70de776 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon index e8cc1bb9b6..791ba6d005 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object epsilon; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k index f537ec71f9..5ae5641cd7 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object k; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut index 387751fcc5..13e1fe317e 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; location "0"; object nut; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties index b94225f096..67d4d8212c 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/RASProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object RASProperties; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary index 117139f505..dc9ecffb7b 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict index 23639a6ccf..15bf44d7f8 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes index 2dc6cd1330..1d912072d2 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution index 5946a9d715..d3cc8eb964 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties index 7974df3e82..bac268df47 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object chemistryProperties; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g index 280bfdbd48..8784850f26 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; location "constant"; object g; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties index c6a80558c7..d67737a9da 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermophysicalProperties; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties index f7257f4c47..b66512853a 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict index 19b0815773..104b7fb286 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes index 3f08dd0d6e..44ac1d7325 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index e5a074276a..fba1cfb66b 100755 --- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution index 7184f4b370..e82817ee69 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSolution; diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/boundary b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/boundary index 60dad0ef57..cbc211f5e8 100644 --- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/boundary +++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs index 49497a91b1..0a7b8e03b9 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object nuSgs; } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index f1d47f185c..cfd2ac99f5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object LESProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary index 4732ca525c..f0310294bf 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties index 5fec422cc1..5a5c092e94 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermodynamicProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties index fd2fcbd917..33725fdef3 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object transportProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties index b15317f91d..16643558c0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index 5e0a946e3b..8e099805e4 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes index 30885565b9..bb1f30fac0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict index a893938513..6cf32020a2 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object refineMeshDict; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs index 6e839ad38d..828b9f2db8 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object nuSgs; } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs index 6e839ad38d..828b9f2db8 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0/nuSgs @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volScalarField; object nuSgs; } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index f1d47f185c..cfd2ac99f5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object LESProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary index 84ff6aae72..25ebc99133 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties index 5fec422cc1..5a5c092e94 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object thermodynamicProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties index fd2fcbd917..33725fdef3 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object transportProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties index b15317f91d..16643558c0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object turbulenceProperties; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index 7b8751d21c..f18d9ad71b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict index bd9779edd7..8e1ea9515e 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object decomposeParDict; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes index 30885565b9..bb1f30fac0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict index 45142b9c32..a9c7d7a917 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object mapFieldsDict; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict index 41a8a3a8f2..6997760bfd 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object refineMeshDict; diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U index 135d68eec2..ad8c802bbf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/U @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; location "0"; object U; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties index 5a4a7846a3..0d2354c583 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/RASProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object RASProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties index 72b462135e..c7f7fa2828 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/filterProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object filterProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g index cf8878d199..635c913725 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class uniformDimensionedVectorField; location "constant"; object g; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties index 70afb6911f..638c7cd6da 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/interfacialProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object interfacialProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties index 049683efc4..72770a8ecc 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/kineticTheoryProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object kineticTheoryProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary index dd2a4252a4..8b7772d76c 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties index e520e29da6..94d9cc4dd1 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/ppProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object ppProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties index 3139e5ec7b..2fa353d073 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/transportProperties @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "constant"; object transportProperties; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict index 1979edbb90..701db0a5b2 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object controlDict; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes index 1891a3fb0a..6d36fbe15d 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/fvSchemes @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object fvSchemes; diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta index 138a11db1d..6b24916ea0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Theta @@ -18,8 +18,6 @@ dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1.0e-4; -referenceLevel 0; - boundaryField { walls diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua index 34aa521130..e1edd44346 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ua @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object Ua; } @@ -18,8 +18,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0 0); -referenceLevel (0 0 0); - boundaryField { walls diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub index 3cde4ff38e..c695473ca0 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/Ub @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class volVectorField; object Ub; } @@ -18,8 +18,6 @@ dimensions [0 1 -1 0 0 0 0]; internalField uniform (0 0.25 0); -referenceLevel (0 0 0); - boundaryField { walls diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon index f115cf793f..09179f2842 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/epsilon @@ -18,8 +18,6 @@ dimensions [ 0 2 -3 0 0 0 0 ]; internalField uniform 10.0; -referenceLevel 0; - boundaryField { walls diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k index 8490dd78a5..e967b088f9 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/k @@ -18,8 +18,6 @@ dimensions [ 0 2 -2 0 0 0 0 ]; internalField uniform 1.0; -referenceLevel 0; - boundaryField { walls diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p index 4ddbe725f6..9f56e51f59 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/0/p @@ -18,8 +18,6 @@ dimensions [ 1 -1 -2 0 0 0 0 ]; internalField uniform 0; -referenceLevel 0; - boundaryField { walls From a76953302ab6926b12ad0121c98408a11c84edf5 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 31 Mar 2011 18:00:39 +0100 Subject: [PATCH 12/36] Porous solvers: corrected change to ddt --- .../compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H | 2 +- .../solvers/multiphase/interFoam/porousInterFoam/UEqn.H | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H index 2a9b92d9f0..4efb76bd45 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H @@ -3,7 +3,7 @@ tmp UEqn ( //pZones.ddt(rho, U) - fvc::ddt(rho, U) + fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) ); diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H b/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H index 246a79d3c9..72ae38ba06 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/UEqn.H @@ -11,7 +11,7 @@ fvVectorMatrix UEqn ( //pZones.ddt(rho, U) - fvc::ddt(rho, U) + fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - fvm::laplacian(muEff, U) - (fvc::grad(U) & fvc::grad(muEff)) From d311e2901198f0af605fb1f81fe3f4732fff4dc0 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 1 Apr 2011 03:16:14 +0100 Subject: [PATCH 13/36] BUG: size was returning points size instead of subset size --- src/meshTools/indexedOctree/treeDataPoint.H | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H index 291927625c..336479d69b 100644 --- a/src/meshTools/indexedOctree/treeDataPoint.H +++ b/src/meshTools/indexedOctree/treeDataPoint.H @@ -86,7 +86,12 @@ public: inline label size() const { - return points_.size(); + return + ( + pointLabels_.size() + ? pointLabels_.size() + : points_.size() + ); } inline const labelList& pointLabels() const From 7d728f5c77f7e149ca8f686140dc90fe416e9ad0 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 1 Apr 2011 03:33:49 +0100 Subject: [PATCH 14/36] ENH: snappyHexMeshDict: added comment. Changed wrt 17x --- .../iglooWithFridges/system/snappyHexMeshDict | 1 + .../snappyMultiRegionHeater/system/snappyHexMeshDict | 5 +++-- .../wingMotion_snappyHexMesh/system/snappyHexMeshDict | 2 +- .../simpleFoam/motorBike/system/snappyHexMeshDict | 2 +- .../simpleWindFoam/turbineSiting/system/snappyHexMeshDict | 2 +- .../LTSInterFoam/wigleyHull/system/snappyHexMeshDict | 2 ++ .../cavitatingBullet/system/snappyHexMeshDict | 6 ++++-- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict index efbcd36312..6266de7dfd 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict @@ -292,6 +292,7 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict index 6e7fa19ef8..e91adb216d 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict @@ -282,9 +282,9 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; - // Advanced settings //- When not to extrude surface. 0 is flat surface, 90 is when two faces @@ -312,7 +312,8 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 130; + // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x. + minMedianAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict index 5484dbc3c7..788aa3ecbe 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict @@ -206,9 +206,9 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; - // Advanced settings //- When not to extrude surface. 0 is flat surface, 90 is when two faces diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict index d7678a15cd..db4951b374 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict @@ -219,9 +219,9 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; - // Advanced settings //- When not to extrude surface. 0 is flat surface, 90 is when two faces diff --git a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict index 25301e24cd..61028710ce 100644 --- a/tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict +++ b/tutorials/incompressible/simpleWindFoam/turbineSiting/system/snappyHexMeshDict @@ -290,7 +290,7 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. - // Note: changed(corrected) w.r.t 16x! (didn't do anything in 16x) + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict index 31b2527a75..840ab30e65 100644 --- a/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict +++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/system/snappyHexMeshDict @@ -241,6 +241,7 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) nGrow 0; @@ -271,6 +272,7 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points + // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x. minMedianAxisAngle 90; // Create buffer region for new layer terminations diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict index 3486a71222..dfc0a4375d 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict @@ -224,7 +224,8 @@ addLayersControls //- If points get not extruded do nGrow layers of connected faces that are // also not grown. This helps convergence of the layer addition process // close to features. - nGrow 1; + // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x) + nGrow 0; // Advanced settings @@ -254,7 +255,8 @@ addLayersControls maxThicknessToMedialRatio 0.3; // Angle used to pick up medial axis points - minMedianAxisAngle 130; + // Note: changed(corrected) w.r.t 17x! 90 degrees corresponds to 130 in 17x. + minMedianAxisAngle 90; // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; From 646f9f8b4c9dee0537fd9a3f73ae58f493a67cb7 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 1 Apr 2011 03:35:43 +0100 Subject: [PATCH 15/36] ENH: meshRefinement: extend test vectors for robustness. 17x indexedOctree was missing intersections which could lead to less refinement --- .../autoHexMesh/meshRefinement/meshRefinement.C | 12 ++++++------ .../meshRefinement/meshRefinementBaffles.C | 8 ++++---- .../meshRefinement/meshRefinementRefine.C | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C index 0c5945f464..738a5cced3 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C @@ -216,8 +216,8 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces) // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } @@ -327,8 +327,8 @@ void Foam::meshRefinement::checkData() // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } @@ -2266,8 +2266,8 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C index 8f8a532e2c..f3ab1e65c9 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C @@ -286,8 +286,8 @@ void Foam::meshRefinement::getBafflePatches // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } @@ -2457,8 +2457,8 @@ Foam::autoPtr Foam::meshRefinement::zonify // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C index 96821d4718..a7cc79ee7a 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C @@ -629,8 +629,8 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } @@ -845,8 +845,8 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement // Extend segments a bit { const vectorField smallVec(Foam::sqrt(SMALL)*(end-start)); - start += smallVec; - end -= smallVec; + start -= smallVec; + end += smallVec; } From 18c364752465c62804804bcdad2c2544e23f3deb Mon Sep 17 00:00:00 2001 From: graham Date: Fri, 1 Apr 2011 15:46:52 +0100 Subject: [PATCH 16/36] BUG: Wrong application name. --- tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun index dfe52836b5..a59d39972d 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory runApplication blockMesh runApplication decomposePar runParallel dsmcInitialise 4 -runParallel dsmcFoam 4 -runApplication `getApplication` -noLagrangian +runParallel `getApplication` 4 +runApplication reconstructPar -noLagrangian # ----------------------------------------------------------------- end-of-file From 069bfbb5081ca2321b1c96a477bf56ba0a995391 Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 1 Apr 2011 17:35:03 +0100 Subject: [PATCH 17/36] ENH: Time: set writePrecision on error streams --- src/OpenFOAM/db/Time/TimeIO.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C index da542524b7..437a0773e8 100644 --- a/src/OpenFOAM/db/Time/TimeIO.C +++ b/src/OpenFOAM/db/Time/TimeIO.C @@ -168,6 +168,12 @@ void Foam::Time::readDict() Pout.precision(IOstream::defaultPrecision()); Perr.precision(IOstream::defaultPrecision()); + + FatalError().precision(IOstream::defaultPrecision()); + FatalIOError.error::operator()().precision + ( + IOstream::defaultPrecision() + ); } if (controlDict_.found("writeCompression")) From df0631c99c66640463b97b3d3bff56cf2cdc8f6d Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 1 Apr 2011 17:36:20 +0100 Subject: [PATCH 18/36] STYLE: dlLibraryTable.C: dlclose comment --- .../db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C index 09537c8e73..3d1878a5f7 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C +++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C @@ -55,6 +55,10 @@ Foam::dlLibraryTable::~dlLibraryTable() { forAllConstIter(dlLibraryTable, *this, iter) { + // bug in dlclose - does not call static destructors of + // loaded library when actually unloading the library. + // See https://bugzilla.novell.com/show_bug.cgi?id=680125 and 657627. + // Seems related to using a non-system compiler! dlClose(iter.key()); } } From 1ea4bb9890e6101f738231c3f371c0c47bc2550b Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 4 Apr 2011 15:25:01 +0100 Subject: [PATCH 19/36] STYLE: faceSet: removed printing of sync --- src/meshTools/sets/topoSets/faceSet.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C index 5580555a61..9ffa4e8da8 100644 --- a/src/meshTools/sets/topoSets/faceSet.C +++ b/src/meshTools/sets/topoSets/faceSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,7 @@ void faceSet::sync(const polyMesh& mesh) } reduce(nAdded, sumOp