From 068e6779e43e249733bda73fd8dd6d3b29d0a9cc Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 15 Feb 2010 19:22:07 +0000 Subject: [PATCH 01/29] STYLE: Header clean-up for Thermo and Reacting Parcels --- .../parcels/Templates/ReactingParcel/ReactingParcel.H | 5 ----- .../parcels/Templates/ThermoParcel/ThermoParcel.H | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 1c7ed466d2..986f420b95 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -39,11 +39,6 @@ SourceFiles #ifndef ReactingParcel_H #define ReactingParcel_H -#include "IOstream.H" -#include "autoPtr.H" -#include "interpolationCellPoint.H" -#include "contiguous.H" - #include "ThermoParcel.H" #include "ReactingCloud.H" #include "reactingParcel.H" diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index 4bcdc43707..7ef2e02016 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -40,11 +40,6 @@ SourceFiles #ifndef ThermoParcel_H #define ThermoParcel_H -#include "IOstream.H" -#include "autoPtr.H" -#include "interpolationCellPoint.H" -#include "contiguous.H" - #include "KinematicParcel.H" #include "ThermoCloud.H" From 78e41f78bd46d1375c5c2a2d739e2212f4f86382 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Feb 2010 10:51:56 +0100 Subject: [PATCH 02/29] STYLE: avoid spaces around fileName::operator/ except when split across lines --- applications/test/fileName/fileNameTest.C | 4 ++-- .../reconstructParMesh/reconstructParMesh.C | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/test/fileName/fileNameTest.C b/applications/test/fileName/fileNameTest.C index 81ebd5c255..3a2a134c80 100644 --- a/applications/test/fileName/fileNameTest.C +++ b/applications/test/fileName/fileNameTest.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ int main() word name; fileName path(SubList(wrdList, wrdList.size()-start, start)); - fileName path2 = "." / path; + fileName path2 = "."/path; IOobject::fileNameComponents ( diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C index 2bc95be4e7..0333eca079 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C +++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C @@ -440,7 +440,7 @@ int main(int argc, char *argv[]) ( databases[procI].findInstance ( - regionDir / polyMesh::meshSubDir, + regionDir/polyMesh::meshSubDir, "points" ) ); @@ -469,10 +469,10 @@ int main(int argc, char *argv[]) "points", databases[procI].findInstance ( - regionDir / polyMesh::meshSubDir, + regionDir/polyMesh::meshSubDir, "points" ), - regionDir / polyMesh::meshSubDir, + regionDir/polyMesh::meshSubDir, databases[procI], IOobject::MUST_READ, IOobject::NO_WRITE, From ac99035a83cae01c01e60528aa3cd4c79ced909c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Feb 2010 16:48:49 +0100 Subject: [PATCH 03/29] COMP: make utilities before solvers. - having all utilities available ASAP is more important than having all solvers immediately --- applications/Allwmake | 2 +- tutorials/multiphase/settlingFoam/ras/tank3D/Allclean | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/Allwmake b/applications/Allwmake index 48e66941d3..9b8bf7d803 100755 --- a/applications/Allwmake +++ b/applications/Allwmake @@ -10,7 +10,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || { set -x -wmake all solvers wmake all utilities +wmake all solvers # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean index f73c44df8a..35e38c65c5 100755 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean @@ -3,4 +3,4 @@ # Clean time folders only rm -rf *[1-9]* -rm log.* +rm -f log.* 2>/dev/null From 63c3b7067b297a14f2e791008afea5948ed6c085 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Feb 2010 16:58:25 +0100 Subject: [PATCH 04/29] STYLE: provide more foam-prefixed aliases - foamApps == app - foamSol == sol - foamTuts == tut - foamUtils == util --- etc/aliases.csh | 7 ++++++- etc/aliases.sh | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/aliases.csh b/etc/aliases.csh index fd7f183a36..892bfbaabd 100644 --- a/etc/aliases.csh +++ b/etc/aliases.csh @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -56,6 +56,11 @@ alias app 'cd $FOAM_APP' alias util 'cd $FOAM_UTILITIES' alias sol 'cd $FOAM_SOLVERS' alias tut 'cd $FOAM_TUTORIALS' + +alias foamApps 'cd $FOAM_APP' +alias foamSol 'cd $FOAM_SOLVERS' +alias foamTuts 'cd $FOAM_TUTORIALS' +alias foamUtils 'cd $FOAM_UTILITIES' alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR' # ----------------------------------------------------------------------------- diff --git a/etc/aliases.sh b/etc/aliases.sh index b193802246..9135fcad0f 100644 --- a/etc/aliases.sh +++ b/etc/aliases.sh @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -56,6 +56,11 @@ alias app='cd $FOAM_APP' alias util='cd $FOAM_UTILITIES' alias sol='cd $FOAM_SOLVERS' alias tut='cd $FOAM_TUTORIALS' + +alias foamApps='cd $FOAM_APP' +alias foamSol='cd $FOAM_SOLVERS' +alias foamTuts='cd $FOAM_TUTORIALS' +alias foamUtils='cd $FOAM_UTILITIES' alias foam3rdParty='cd $WM_THIRD_PARTY_DIR' # ----------------------------------------------------------------------------- From cf49a74f9c0807e96fea4337fb99f5a3ae216c44 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Feb 2010 18:23:54 +0100 Subject: [PATCH 05/29] STYLE: combine removal of .gz file versions in foamClearPolyMesh --- bin/foamClearPolyMesh | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/bin/foamClearPolyMesh b/bin/foamClearPolyMesh index 40689539ab..9f6b28f651 100755 --- a/bin/foamClearPolyMesh +++ b/bin/foamClearPolyMesh @@ -114,6 +114,7 @@ fi # # remove files (mesh itself, modifiers, snappyHexMesh ones) and subdirectories +# also remove .gz versions of the same files # echo "Clearing ${caseDir:-.}/$meshDir" 1>&2 @@ -134,25 +135,9 @@ for i in \ pointLevel \ refinementHistory \ surfaceIndex \ - points.gz \ - faces.gz \ - owner.gz \ - neighbour.gz \ - cells.gz \ - boundary.gz \ - pointZones.gz \ - faceZones.gz \ - cellZones.gz \ - meshModifiers.gz \ - parallelData.gz \ - sets.gz \ - cellLevel.gz \ - pointLevel.gz \ - refinementHistory.gz \ - surfaceIndex.gz \ ; do - rm -rf $meshDir/$i + rm -rf $meshDir/$i $meshDir/$i.gz done #------------------------------------------------------------------------------ From 07d070b1fc90e0d777687cf0edfd576e1dc73c60 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 19 Feb 2010 06:18:19 +0100 Subject: [PATCH 06/29] STYLE: move some doxygen documentation from foamVersion.H -> foamDoc.H - avoids a full rebuild for simple documentation changes --- src/OpenFOAM/global/foamDoc.H | 58 +++++++++++++++++++++++++++++++ src/OpenFOAM/global/foamVersion.H | 34 ------------------ 2 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 src/OpenFOAM/global/foamDoc.H diff --git a/src/OpenFOAM/global/foamDoc.H b/src/OpenFOAM/global/foamDoc.H new file mode 100644 index 0000000000..82a85d8972 --- /dev/null +++ b/src/OpenFOAM/global/foamDoc.H @@ -0,0 +1,58 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +@mainpage OpenFOAM®: open source CFD + +@section about About OpenFOAM + + OpenFOAM is a free, open source CFD software package produced by + a commercial company, + OpenCFD Ltd. + It has a + large user base across most areas of engineering and science, + from both commercial and academic organisations. OpenFOAM has an + extensive range of features to solve anything from complex fluid + flows involving chemical reactions, turbulence and heat transfer, + to solid dynamics and electromagnetics. + More ... + +@section users Our commitment to the users + + OpenFOAM comes with full commercial support from OpenCFD, including + software support, + contracted developments + and a programme of training courses. + These activities fund the development, maintenance and release of + OpenFOAM to make it an extremely viable commercial open source product. + +@section opensource Our commitment to open source + + OpenCFD is committed to open source software, continually developing and + maintaining OpenFOAM under the + GNU General Public Licence. + OpenFOAM will always be free of charge and open source. + In addition, we endeavour to support other viable open source initiatives + that will benefit science and engineering. + +\*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H index 50bf27591c..4a479b2799 100644 --- a/src/OpenFOAM/global/foamVersion.H +++ b/src/OpenFOAM/global/foamVersion.H @@ -44,40 +44,6 @@ Description SourceFiles global.Cver - -@mainpage OpenFOAM®: open source CFD - -@section about About OpenFOAM - - OpenFOAM is a free, open source CFD software package produced by - a commercial company, - OpenCFD Ltd. - It has a - large user base across most areas of engineering and science, - from both commercial and academic organisations. OpenFOAM has an - extensive range of features to solve anything from complex fluid - flows involving chemical reactions, turbulence and heat transfer, - to solid dynamics and electromagnetics. - More ... - -@section users Our commitment to the users - - OpenFOAM comes with full commercial support from OpenCFD, including - software support, - contracted developments and - a programme of training courses. - These activities fund the development, maintenance and release of - OpenFOAM to make it an extremely viable commercial open source product. - -@section opensource Our commitment to open source - - OpenCFD is committed to open source software, continually developing and - maintaining OpenFOAM under the - GNU General Public Licence. - OpenFOAM will always be free of charge and open source. - In addition, we endeavour to support other viable open source initiatives - that will benefit science and engineering. - \*---------------------------------------------------------------------------*/ #ifndef foamVersion_H From 91532a8bcba60fc047e0241914cba0c2c64facea Mon Sep 17 00:00:00 2001 From: mattijs Date: Fri, 19 Feb 2010 12:47:01 +0000 Subject: [PATCH 07/29] STYLE: removed unused variable. --- .../pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C index 20727c1752..e25244da12 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C @@ -57,7 +57,6 @@ void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&) { const edgeList& cp = cyclicPolyPatch_.coupledPoints(); const labelList& mp = cyclicPolyPatch_.meshPoints(); - const pointField& points = cyclicPolyPatch_.points(); DynamicList