diff --git a/.gitignore b/.gitignore index 67ac189fcc..7c8bce03fe 100644 --- a/.gitignore +++ b/.gitignore @@ -48,9 +48,10 @@ platforms/ !wmake/rules/*/ # doxygen generated documentation -doc/[Dd]oxygen/html -doc/[Dd]oxygen/latex -doc/[Dd]oxygen/man +doc/Doxygen/html +doc/Doxygen/latex +doc/Doxygen/man +doc/Doxygen/DTAGS # generated files in the main directory (e.g. ReleaseNotes-?.?.html) # and in the doc directory diff --git a/README.html b/README.html new file mode 100644 index 0000000000..be5915a560 --- /dev/null +++ b/README.html @@ -0,0 +1,196 @@ + + + + +OpenFOAM README for version 2.0.0 + + + + + + + + + + + +
+ +

OpenFOAM README for version 2.0.0

+ +
+

Table of Contents

+
+ +
+
+ +
+

1 About OpenFOAM

+
+ +

OpenFOAM is a free, open source computational fluid dynamcis (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. +

+
+ +
+ +
+

2 Copyright

+
+ +

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 3 of the License, or (at your option) any later + version. See the file COPYING in this directory or + http://www.gnu.org/licenses/, for a description of the GNU General Public + License terms under which you can copy the files. +

+
+ +
+ +
+

3 Download and installation instructions

+
+ + + + +
+ +
+ +
+

4 Release notes

+
+ +

http://www.OpenFOAM.com/version2.0.0 +

+
+ +
+ +
+

5 Documentation

+
+ +

http://www.OpenFOAM.com/docs +

+
+ +
+ +
+

6 Support and development contracts

+
+ +

http://www.OpenFOAM.com/support +

+
+ +
+ +
+

7 Reporting Bugs in OpenFOAM

+
+ +

http://www.OpenFOAM.com/bugs +

+
+
+

Date: 16th June 2011

+

Org version 7.5 with Emacs version 23

+Validate XHTML 1.0 +
+
+ + diff --git a/README.org b/README.org new file mode 100644 index 0000000000..236d3299c1 --- /dev/null +++ b/README.org @@ -0,0 +1,44 @@ +# -*- mode: org; -*- +# +#+TITLE: OpenFOAM README for version 2.0.0 +#+AUTHOR: OpenCFD Ltd. +#+DATE: 16th June 2011 +#+LINK: http://www.openfoam.com +#+OPTIONS: author:nil ^:{} +# Copyright (c) 2011 OpenCFD Ltd. + +* About OpenFOAM + OpenFOAM is a free, open source computational fluid dynamcis (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. + +* Copyright + 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 3 of the License, or (at your option) any later + version. See the file =COPYING= in this directory or + [[http://www.gnu.org/licenses/]], for a description of the GNU General Public + License terms under which you can copy the files. + +* Download and installation instructions + + To install the Ubuntu/Debian (.deb) pack, see + [[http://www.OpenFOAM.com/download/ubuntu.php]] + + To install the source (.gtgz) pack, see + [[http://www.OpenFOAM.com/download/source.php]] + + To install from the Git repository, see + [[http://www.OpenFOAM.com/download/git.php]] + +* Release notes + [[http://www.OpenFOAM.com/version2.0.0]] + +* Documentation + [[http://www.OpenFOAM.com/docs]] + +* Support and development contracts + [[http://www.OpenFOAM.com/support]] + +* Reporting Bugs in OpenFOAM + [[http://www.OpenFOAM.com/bugs]] diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev deleted file mode 100644 index b49004337d..0000000000 --- a/ReleaseNotes-dev +++ /dev/null @@ -1,333 +0,0 @@ -# -*- mode: org; -*- -# -#+TITLE: OpenFOAM release notes for version dev -#+AUTHOR: OpenCFD Ltd. -#+DATE: TBA -#+LINK: http://www.openfoam.com -#+OPTIONS: author:nil ^:{} -# Copyright (c) 2011 OpenCFD Ltd. - -* Overview - OpenFOAM-dev is the latest major release of OpenFOAM including many new - developments a number of bug-fixes. This release passes our standard tests - and the tutorials have been broadly checked. Please report any bugs by - following the link: http://www.openfoam.com/bugs. - -* GNU/Linux version - This release of OpenFOAM is distributed primarily in 2 ways: (1) as a Debian - pack containing binaries and source; (2) from the SourceForge source code - repository (see [[./README.org][README]]). - - The Ubuntu/Debian pack is available for 32 and 64 bit versions of the 10.04 - LTS operating system using the system compiler and libraries that will be - installed automatically from standard Debian packs. - - To use the source version from the SourceForge repository, we provide a source - pack of third-party packages that can be compiled on the user's system. This - does not include =gcc=, since the system installed version is typically - sufficient, but includes =paraview-3.8.0=, =openmpi-1.4.1=, =scotch_5.1=, - =metis-5.0pre2=, =ParMetis-3.1= and =ParMGridGen-1.0=. - -* Library developments - - There have been a number of developments to the libraries to support the - extension of functionality in solver and utility applications. -*** Core library - + Large number of code refinements and consistency improvements to support - other developments. - + Parallel : using non-blocking communications wherever possible. This will - lead to lower requirements for MPI_BUFFER_SIZE and possibly better - start-up performance on larger numbers of processors. -*** Turbulence modelling -*** *Updated* thermophysical libraries - + Now use the more descriptive dictionary input format, e.g. for a single - component mixture: - #+BEGIN_SRC c++ - thermoType hPsiThermo>>>>; - - mixture - { - nMoles 1; - molWeight 28.9; - Cp 1007; - Hf 0; - As 1.4792e-06; - Ts 116; - } - #+END_SRC -*** Lagrangian intermediate library - + Extensively updated - + *Updated* input format - + Extended to include steady cloud tracking - + *New* collision modelling - + *Coupled* to new surface film modelling library - + *New* sub-models - + NonSphereDrag: drag model to account for non-spherical particles - + ParticleTracks: post-processing model to generate track data, typically - during steady calculations - + *Updated* sub-models - + Devolatilisation models: now act on a per-specie basis - -*** DSMC -*** Dynamic Mesh -*** Numerics -*** *Updated* command line help, e.g. `snappyHexMesh -help' now gives: - #+BEGIN_SRC c++ - Usage: snappyHexMesh [OPTIONS] - options: - -case specify alternate case directory, default is the cwd - -overwrite overwrite existing mesh/results files - -parallel run in parallel - -srcDoc display source code in browser - -doc display application documentation in browser - -help print the usage - #+END_SRC -*** *New* basicSolidThermo solids thermophysical library - + Used in all conjugate heat transfer solvers - + constant properties - + temperature dependent properties - + temperature and direction (in local coordinate system) dependent - properties -*** *New* Surface film library - + Creation of films by particle addition, or initial film distribution - + Coupled with the lagrangian/intermediate cloud hierarchy library - + Hierarchical design, consisting of - + kinematic film: mass, momentum - + constant thermodynamic properties - + thermodynamic film: mass, momentum and enthalpy - + constant, or temperature dependant thermodynamic properties - + Sub-models: - + detachment/dripping whereby particles (re)enter the originating cloud - + particle sizes set according to PDF - + other properties set to ensure mass, momentum and energy conservation - + heat transfer to/from walls and film surface - + film evaporation and boiling - + Additional wall functions for primary region momentum and temperature - taking film into account - + Parallel aware -*** *New* ptscotch decomposition method. -*** *New* multiLevel decomposition method. - Decomposes in levels, e.g. first decompose onto number of nodes and - then onto number of cores per node. This will minimise off-node - communication. Each level can use any of the other decomposition methods -*** *New* structured decomposition method. - Does a 2D decomposition of a mesh. Valid only for an 'extruded' mesh, i.e. - columns of cells originating from a patch. Bases decomposition on this - patch and assigns the cells according to the patch decomposition. -*** *Updated* scotch decomposition method to run in parallel by doing - decomposition on the master. Unfortunately scotch and ptscotch cannot - be linked in to the same executable. -*** *Updated* simple decomposition method to run in parallel by doing - decomposition on the master. -*** *Updated* decomposePar maps polyPatches instead of recreating them so - polyPatches holding data can map the data. -*** *Updated* particle tracking algorithm - + uses non-blocking parallel transfers - + does 'minimum-tet' decomposition of face to work with warped faces - (snappyHexMesh!) - + reuses tracking state in interpolation - improves consistency and speed -*** *Updated* split cyclics into two separate patches. - See [[./doc/changes/splitCyclic.txt]] - * *New* cyclics (and all coupled patches) have optional - matchTolerance entry to allow looser area matching tolerance. - * *Updated* interpolation (volPointInterpolation) now works without the - globalPointPatch. Moving mesh cases can now be run non-parallel and - continued in parallel and reconstructed without any limitation. -*** *New* compact binary I/O for faces and cells. - This speeds up reading/writing meshes in binary. Binary mesh reading - is backwards (but not forwards) compatible. Use ascii mesh format or - foamFormatConvert. -*** *Updated* runTimeModifiable - + user selectable model to use for checking run-time modifiable - dictionaries (see also doc/changes/inotify.txt): - + timeStamp : use time stamp as before - + inotify : use inotify instead of time stamp - + timeStampMaster : only master checks and reads file. Slaves get file - contents from master. - + inotifyMaster : only master checks and reads file. Slaves get file - contents from master. - + on linux optionally uses inotify instead of time stamps - more efficient - for large numbers of monitored files. No more fileModificationSkew needed. - + single integer reduction instead of one reduction per monitored file. - + only files that can be re-read are being checked by specifying - in the IOobject constructor MUST_READ_IF_MODIFIED instead of - MUST_READ. Drastic reduction of number of files to check. -*** *New* #codeStream dictionary entry - Uses dynamic compilation of OpenFOAM C++ code to construct dictionary. - E.g. in blockMeshDict: - #+BEGIN_SRC c++ - convertToMeters 0.001; - - vertices #codeStream - { - code - #{ - label nVerts = - readLabel(dict.lookup("nx")) - *readLabel(dict.lookup("ny")) - *readLabel(dict.lookup("nz")); - pointField verts(nVerts); - // Now fill verts here - // .. - os << verts; - #}; - } - #+END_SRC - See also ./[[doc/changes/dynamicCode.org]] - -* Solvers - A number of new solvers have been developed for a range of engineering - applications. There has been a set of improvements to certain classes of - solver that are introduced in this release. -*** *New* Solvers - + =reactingParcelFilmFoam=: Lagrangian cloud and film transport in a - reacting gas phase system - + =steadyReactingParcelFoam=: Steady solution of cloud and reacting systems - using local time stepping methods -*** Modifications to multiphase and buoyant solvers - + ... -*** Modifications to solvers for sensible enthalpy - + ... -*** Modifications to steady-state compressible solvers - + ... -*** Other modifications - + ... - -* Boundary conditions - New boundary conditions have been introduced to support new applications in - OpenFOAM. - + *New* wall functions: - + kappatJayatillekeWallFunction: incompressible RAS thermal wall function - + directMappedFixedValue: - + takes interpolationScheme so can interpolate instead of always getting - cell value - + takes optional fieldName to sample - + directMapped patch added 'normal' method to calculate sample points - to e.g. sample fields just above wall (e.g. for streaklines) - + *New* codedFixedValue: Uses the dynamic code compilation from #codeStream - to provide an in-line fixedValueFvPatchScalarField. E.g. - #+BEGIN_SRC c++ - outlet - { - type codedFixedValue; - value uniform 0; - redirectType ramped; - - code - #{ - operator==(min(10, 0.1*this->db().time().value())); - #}; - } - #+END_SRC - See also [[./doc/changes/dynamicCode.org]] - + cyclicSlip: cyclic with point motion constrained to tangential plane. - Can be used with any mesh movement, e.g. snapping in snappyHexMesh. -* Utilities - There have been some utilities added and updated in this release. -*** *New* utilities - + =extrudeToRegionMesh=: Extrude faceZones into separate mesh (as a - different region) - + used to e.g. extrude baffles (extrude internal faces) or create - liquid film regions - + if extruding internal faces: - + create baffles in original mesh with directMappedWall patches - + if extruding boundary faces: - + convert boundary faces to directMappedWall patches - + extrude edges of faceZone as a _sidePatch - + extrude edges inbetween different faceZones as a - (nonuniformTransform)cyclic _ - + extrudes into master direction (i.e. away from the owner cell - if flipMap is false) - + =topoSet=: replacement of cellSet,faceSet,pointSet utilities. Multiple - commands operating on different sets. - Comparable to a dictionary driven =setSet= utility. -*** Updated utilities - + =setFields=: optionally use faceSets to set patch values (see - e.g. =hotRoom= tutorial). - + =blockMesh=: specify patches via dictionary instead of type only. This - makes rereading the boundary file superfluous. see - e.g. pitzDailyDirectMapped tutorial. - + =setSet=: allows time range (e.g. 0:100) in combination with -batch - argument to execute the commands for multiple times. - + =extrudeMesh=: - - option to add extrusion to existing mesh. - - works in parallel - + =snappyHexMesh=: - + extrude across multi-processor boundaries - + specify type of patches created during meshing - + handle cyclics in initial mesh (non parallel meshing only) - + preserve faceZones shape during layering - + combining coincident patch faces is now default after snapping - + *Warning*: - - snapControls::tolerance setting fixed w.r.t. 17x. Is the - multiplication to calculate the local search distance for nearest. - - minMedianAxisAngle angle fixed w.r.t. 17x. Set to - 90 to get same behaviour as 130 in 17x. - - nGrow did not work in 17x. Set to 0 - to get same behaviour as 130 in 17x. - - nSolveIter reinstated to smooth internal mesh. Set to 0 - to get same behaviour at 17x. - - new minTetQuality setting (see tracking). Disable for 17x - compatibility. -* Post-processing - + =paraFoam=, =foamToVTK=: full support for polyhedral cell type in recent - Paraview versions. - + =foamToEnsight=: parallel continuous data. new =-nodeValues= option to - generate and output nodal field data. - + =singleCellMesh=: new utility to convert mesh and fields to a single cell - mesh. Great for postprocessing. - + =steadyParticleTracks=: Generates VTK tracks from the output of the cloud - =ParticleTracks= post-processing sub-model - + Sampling: - + =patchInternalField=: new sampledSurface - like 'patch' but samples - internal field instead of boundary field. - + =ensight=: new output format for all sampledSurfaces. - + Function objects: - + =abortCalculation=: watches for presence of the named file in the - $FOAM_CASE directory and aborts the calculation if it is present - + =timeActivatedFileUpdate=: performs a file copy/replacement once a - specified time has been reached, e.g. to automagically change fvSchemes and - fvSolution during a calculation - + =streamLine=: generate streamlines; ouputs both trajectory and field data - + =surfaceInterpolateFields=: constructs face interpolate of registered - volFields for any future functionObjects that need surfaceFields. - + =readFields=: reads field if not yet registered. Makes functionObjects - useable through standalone execFlowFunctionObjects. - + =faceSource=: can now calculate on a sampledSurface (e.g. flow through a - triSurfaceMesh). - + =nearWallFields=: constructs field with on selected patches interpolated - internal field for further postprocessing. - + =coded=: uses the dynamic code compilation from =#codeStream= - to provide an in-line functionObject. E.g. - #+BEGIN_SRC c++ - functions - { - pAverage - { - functionObjectLibs ("libutilityFunctionObjects.so"); - type coded; - redirectType average; - code - #{ - const volScalarField& p = mesh().lookupObject("p"); - Info<<"p avg:" << average(p) << endl; - #}; - } - } - #+END_SRC - See also [[./doc/changes/dynamicCode.org]] - - -* New tutorials - There is a large number of new tutorials for existing and new solvers in the - release. - + =reactingParcelFilmFoam= tutorials: - + multipleBoxes, hotBoxes, panel, evaporationTest - + =interDyMFoam= tutorials: - + testTubeMixer: showcases =solidBodyMotionFunction= - + =snappyHexMesh= tutorials: - + flange: demonstration of feature lines in snappyHexMesh - -* Other - + compilable with =clang= - In your prefs.sh set the WM_COMPILER to Clang diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 808b964e4f..8e4a12ee0d 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -105,7 +105,6 @@ int main(int argc, char *argv[]) runTime.functionObjects().end(); - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C index fdbefa9b2f..765dd666ce 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.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 @@ -103,10 +103,18 @@ maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField ( vectorField("value", dict, p.size()) ); - } - else - { - mixedFixedValueSlipFvPatchVectorField::evaluate(); + + if (dict.found("refValue") && dict.found("valueFraction")) + { + this->refValue() = vectorField("refValue", dict, p.size()); + this->valueFraction() = + scalarField("valueFraction", dict, p.size()); + } + else + { + this->refValue() = *this; + this->valueFraction() = scalar(1.0); + } } } diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H index dc4d5655cf..45fc95065b 100644 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H +++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H @@ -6,9 +6,9 @@ + turbulence->divDevReff(U) ); - UEqn().relax(); - // Add resistance on the actuation disks actuationDisks.addSu(UEqn()); + UEqn().relax(); + solve(UEqn() == -fvc::grad(p)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 1a28760491..8ee437b871 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.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,6 +140,8 @@ Foam::tmp Foam::SchaefferFrictionalStress::muf } } + muff.correctBoundaryConditions(); + return tmuf; } diff --git a/applications/test/codeStream/codeStreamDict1 b/applications/test/codeStream/codeStreamDict1 index 59eb3d43f6..ea0c882cf5 100644 --- a/applications/test/codeStream/codeStreamDict1 +++ b/applications/test/codeStream/codeStreamDict1 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: Any | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -51,9 +51,7 @@ writeInterval #codeStream #}; }; - // play with cleanup #remove begIter - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options index 405e346e80..a071d9557c 100644 --- a/applications/test/dataEntry/Make/options +++ b/applications/test/dataEntry/Make/options @@ -9,4 +9,5 @@ EXE_LIBS = \ -llagrangianIntermediate \ -lradiationModels \ -lthermophysicalFunctions \ - -lregionModels + -lregionModels \ + -lsampling diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict index fe7ce2d7a6..1af465358d 100644 --- a/applications/test/dictionary/testDict +++ b/applications/test/dictionary/testDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: Any | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -33,13 +33,11 @@ active value $internalField; } - inactive { type zeroGradient; } - boundaryField { Default_Boundary_Region @@ -96,13 +94,11 @@ baz $active } - "anynumber.*" { $active } - // this should work #remove active diff --git a/applications/test/dictionary/testDict2 b/applications/test/dictionary/testDict2 index 28679b993e..5baa71d979 100644 --- a/applications/test/dictionary/testDict2 +++ b/applications/test/dictionary/testDict2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: Any | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex index 3e091a4d7f..2f3d2600f6 100644 --- a/applications/test/dictionary/testDictRegex +++ b/applications/test/dictionary/testDictRegex @@ -7,10 +7,10 @@ \*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - class dictionary; - object testDictRegex; + version 2.0; + format ascii; + class dictionary; + object testDictRegex; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #inputMode merge diff --git a/applications/test/maxMem/Make/options b/applications/test/maxMem/Make/options index 1570a9377e..c1239ff7aa 100644 --- a/applications/test/maxMem/Make/options +++ b/applications/test/maxMem/Make/options @@ -1 +1 @@ -EXE_LIBS = $(FOAM_EXT_LIBBIN)/libfbsdmalloc.o +EXE_LIBS = /* $(FOAM_EXT_LIBBIN)/libfbsdmalloc.o */ diff --git a/applications/test/momentOfInertia/Test-momentOfInertia.C b/applications/test/momentOfInertia/Test-momentOfInertia.C index 8f6e5e2acd..9000df4c50 100644 --- a/applications/test/momentOfInertia/Test-momentOfInertia.C +++ b/applications/test/momentOfInertia/Test-momentOfInertia.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 @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) { const label cellI = args.optionLookupOrDefault("cell", 0); - tensorField mI = momentOfInertia::meshInertia(mesh); + tensorField mI(momentOfInertia::meshInertia(mesh)); tensor& J = mI[cellI]; diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C index 1282c7ee22..bc5776aff6 100644 --- a/applications/test/pointField/Test-PointField.C +++ b/applications/test/pointField/Test-PointField.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 @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) pointPatchVectorField::calculatedType() ); - pointVectorField V = U + 2*U; + pointVectorField V(U + 2*U); Info<< "End\n" << endl; diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict index 3ae07af37c..2cd9c50958 100644 --- a/applications/test/router/routerDict +++ b/applications/test/router/routerDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object routeDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Connected cells diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict index 342128a2f5..bb421181b9 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMeshDict @@ -34,7 +34,4 @@ blockedCells blockedCellsSet; // this patch defaultPatch outer; - - - // ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict index 806c24f580..d9eb0d474c 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict @@ -12,17 +12,14 @@ FoamFile class dictionary; object autoRefineMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // Surface to keep to surface "plexi.obj"; // What is outside. These points have to be inside a cell (so not on a face!) outsidePoints ((-0.99001 -0.99001 -0.99001)); - // // Selection of cells to refine // @@ -50,7 +47,6 @@ minEdgeLen 0.1; // this) cellLimit 2500000; - // // Selection of final set // @@ -69,8 +65,6 @@ nearDistance -1; // are either kept and refined (selectHanging) or removed from the set selectHanging false; - - // // Refinement parameters // @@ -79,7 +73,6 @@ selectHanging false; coordinateSystem global; //coordinateSystem patchLocal; - // .. and its coefficients. x,y in this case. (normal = tan1^tan2) globalCoeffs { diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict index 01628a0429..a9ebc76a94 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object modifyMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Move points: @@ -39,8 +38,6 @@ facesToTriangulate (( -0.039123 -0.45045 0.74083) (-0.03844 -0.45049 0.73572)) ); - - // Edges to collapse. First coord is point on the edge, second is coordinate // to collapse to. edgesToCollapse @@ -48,8 +45,6 @@ edgesToCollapse ((0.054975 0.099987 0.0044074)(0.054975 0.099987 0.0044074)) ); - - // Split cells: // First coord is a point inside the cell to split. A point inside the cell will // be introduced and the cell will get decomposed into polygonal base pyramids @@ -59,7 +54,6 @@ cellsToSplit (( -0.039123 -0.45045 0.74083) (-0.03844 -0.45049 0.73572)) ); - // Change patch: // Changes patchID of faces. Coord selects the face, label is the patch index. facesToRepatch @@ -67,7 +61,6 @@ facesToRepatch (( -0.039123 -0.45045 0.74083) 1) ); - //// Create cell: //// Creates a cell on the boundary given a face covering a cavity. Gets //// the vertices of the face (outwards pointing normal) and a point internal @@ -82,5 +75,4 @@ facesToRepatch // ) //); - // ************************************************************************* // diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict index 1a3e3f0beb..143269548b 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict +++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict @@ -12,10 +12,8 @@ FoamFile class dictionary; object selectCellsDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // Whether to use surface. If false no surface will be read and only // outsidePoints/selectOutside will be used to determine cells to keep. useSurface false; @@ -26,7 +24,6 @@ surface "plexi.obj"; // What is outside outsidePoints ((-1 -1 -1)); - // // Selection of final set // diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict index d2ec690542..fb2d6bae6c 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict +++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMeshDict @@ -31,13 +31,9 @@ exposedPatchName movingWall; // If construct from surface: surface "movingWall.stl"; - - // Flip surface normals before usage. flipNormals false; - - //- Linear extrusion in point-normal direction //extrudeModel linearNormal; @@ -87,10 +83,8 @@ sigmaRadialCoeffs pStrat 1; } - // Do front and back need to be merged? Usually only makes sense for 360 // degree wedges. mergeFaces false; //true; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict index 983a890755..fbd26416b8 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMeshDict @@ -83,5 +83,4 @@ sigmaRadialCoeffs pStrat 1; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict index b50a614713..23f6d32c23 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object snappyHexMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Which of the steps to run @@ -20,7 +19,6 @@ castellatedMesh true; snap true; addLayers false; - // Geometry. Definition of all surfaces. All surfaces are of class // searchableSurface. // Surfaces are used @@ -62,8 +60,6 @@ geometry } }; - - // Settings for the castellatedMesh generation. castellatedMeshControls { @@ -95,14 +91,11 @@ castellatedMeshControls // nProcs). 0=balance always. maxLoadUnbalance 0.10; - // Number of buffer layers between different levels. // 1 means normal 2:1 refinement restriction, larger means slower // refinement. nCellsBetweenLevels 1; - - // Explicit feature edge refinement // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -117,8 +110,6 @@ castellatedMeshControls //} ); - - // Surface based refinement // ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -157,7 +148,6 @@ castellatedMeshControls // Otherwise leave out or set to negative number. //perpendicularAngle 10; - //- Optional faceZone and (for closed surface) cellZone with // how to select the cells that are in the cellZone // (inside / outside / specified insidePoint) @@ -169,7 +159,6 @@ castellatedMeshControls resolveFeatureAngle 30; - // Region-wise refinement // ~~~~~~~~~~~~~~~~~~~~~~ @@ -197,7 +186,6 @@ castellatedMeshControls //} } - // Mesh selection // ~~~~~~~~~~~~~~ @@ -208,15 +196,12 @@ castellatedMeshControls // after refinement. locationInMesh (5 0.28 0.43); - // Whether any faceZones (as specified in the refinementSurfaces) // are only on the boundary of corresponding cellZones or also allow // free-standing zone faces. Not used if there are no faceZones. allowFreeStandingZoneFaces true; } - - // Settings for the snapping. snapControls { @@ -241,8 +226,6 @@ snapControls //nFeatureSnapIter 10; } - - // Settings for the layer addition. addLayersControls { @@ -267,7 +250,6 @@ addLayersControls // Expansion factor for layer mesh expansionRatio 1.0; - //- Wanted thickness of final added cell layer. If multiple layers // is the // thickness of the layer furthest away from the wall. @@ -287,7 +269,6 @@ addLayersControls // 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 @@ -321,7 +302,6 @@ addLayersControls // Create buffer region for new layer terminations nBufferCellsNoExtrude 0; - // Overall max number of layer addition iterations. The mesher will exit // if it reaches this number of iterations; possibly with an illegal // mesh. @@ -333,8 +313,6 @@ addLayersControls nRelaxedIter 20; } - - // Generic mesh quality settings. At any undoable phase these determine // where to undo. meshQualityControls @@ -392,7 +370,6 @@ meshQualityControls // If <0 : delete always. //minVolCollapseRatio 0.5; - // Advanced //- Number of error distribution iterations @@ -400,8 +377,6 @@ meshQualityControls //- amount to scale back displacement at error points errorReduction 0.75; - - // Optional : some meshing phases allow usage of relaxed rules. // See e.g. addLayersControls::nRelaxedIter. relaxed @@ -411,7 +386,6 @@ meshQualityControls } } - // Advanced // Flags for optional output @@ -421,10 +395,8 @@ meshQualityControls // 4 : write current intersections as .obj files debug 0; - // Merge tolerance. Is fraction of overall bounding box of initial mesh. // Note: the write tolerance needs to be higher than this. mergeTolerance 1e-6; - // ************************************************************************* // diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict index 60719b72c3..1765148a39 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict +++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object createPatchDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // This application/dictionary controls: @@ -39,7 +38,6 @@ FoamFile // - or change patch type from 'cyclic' to 'patch' // and regenerate cyclic as above - // Do a synchronisation of coupled points after creation of any patches. // Note: this does not work with points that are on multiple coupled patches // with transformations (i.e. cyclics). diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict index 4fed4df2c0..0c6a0170df 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object mirrorMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // planeType pointAndNormal; diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict index 028fcd32db..6bd8d51845 100644 --- a/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict +++ b/applications/utilities/mesh/manipulation/refineMesh/refineMeshDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object refineMeshDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Cells to refine; name of cell set @@ -26,7 +25,6 @@ set c0; coordinateSystem global; //coordinateSystem patchLocal; - // .. and its coefficients. x,y in this case. (normal direction is calculated // as tan1^tan2) globalCoeffs diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict index e08341880b..34ea6ed4f1 100644 --- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict +++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object topoSetDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // List of actions. Each action is a dictionary with e.g. @@ -297,8 +296,6 @@ FoamFile // cellSet c0; // name of cellSet of slave side // } - - actions ( // Example:pick up internal faces on outside of cellSet diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict index 94a3b75c1f..eacccaecc3 100644 --- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict +++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict @@ -11,10 +11,8 @@ FoamFile format ascii; class dictionary; note "mesh decomposition control dictionary"; - location "system"; object decomposeParDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // numberOfSubdomains 8; @@ -108,7 +106,6 @@ manualCoeffs dataFile "decompositionData"; } - structuredCoeffs { // Patches to do 2D decomposition on. Structured mesh only; cells have @@ -116,8 +113,6 @@ structuredCoeffs patches (bottomPatch); } - - //// Is the case distributed //distributed yes; //// Per slave (so nProcs-1 entries) the directory above the case. @@ -127,5 +122,4 @@ structuredCoeffs // "/tmp" //); - // ************************************************************************* // diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C index 36a6ad2eb4..95a471844b 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C @@ -265,8 +265,8 @@ bool Foam::domainDecomposition::writeDecomposition() Time::controlDictName, time().rootPath(), processorCasePath, - "system", - "constant" + word("system"), + word("constant") ); processorDb.setTime(time()); diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict index 2c6b9a3d83..4f7811d979 100644 --- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict +++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluentDict @@ -13,7 +13,6 @@ FoamFile class dictionary; object foamDataToFluentDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // p 1; diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties index 2183c4cbf7..2b97c12e57 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,5 +20,4 @@ sampleFrequency 1; maxPositions 1000000; - // ************************************************************************* // diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict index 58ca1d12eb..98c16ebe4e 100644 --- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict +++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/particleTrackDict @@ -10,7 +10,6 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; object particleTrackDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict index f9cc044535..fc5f2d39bc 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfDict @@ -35,5 +35,4 @@ RosinRammlerPDF n (0.8); } - // ************************************************************************* // diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict index 22c859f31f..32961a5d45 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannelDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object postChannelDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Seed patches to start layering from diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probesDict b/applications/utilities/postProcessing/sampling/probeLocations/probesDict index bd6a4c9c93..af047efe7a 100644 --- a/applications/utilities/postProcessing/sampling/probeLocations/probesDict +++ b/applications/utilities/postProcessing/sampling/probeLocations/probesDict @@ -7,16 +7,13 @@ \*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; - format ascii; - class dictionary; - location system; - object probesDict; + version 2.0; + format ascii; + class dictionary; + object probesDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // Fields to be probed. runTime modifiable! fields ( diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict index e413b94cc4..becaae12f7 100644 --- a/applications/utilities/postProcessing/sampling/sample/sampleDict +++ b/applications/utilities/postProcessing/sampling/sample/sampleDict @@ -5,16 +5,13 @@ | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - class dictionary; - location system; - object sampleDict; + version 2.0; + format ascii; + class dictionary; + object sampleDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // Set output format : choice of @@ -48,7 +45,6 @@ formatOptions } } - // interpolationScheme. choice of // cell : use cell-centre value only; constant over cells (default) // cellPoint : use cell-centre and vertex values @@ -65,7 +61,6 @@ fields U ); - // Set sampling definition: choice of // uniform evenly distributed points on line // face one point per face intersection @@ -120,7 +115,6 @@ sets ); - // Surface sampling definition // // 1] patches are not triangulated by default @@ -247,5 +241,4 @@ surfaces } ); - // *********************************************************************** // diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C index f71df8c6f3..387b791592 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C +++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C @@ -43,16 +43,26 @@ Description using namespace Foam; -// Main program: +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { - #include "addRegionOption.H" + argList::addOption + ( + "dict", + "word", + "name of dictionary to provide patch agglomeration controls" + ); #include "setRootCase.H" #include "createTime.H" #include "createNamedMesh.H" + word agglomDictName + ( + args.optionLookupOrDefault("dict", "faceAgglomerateDict") + ); + const polyBoundaryMesh& patches = mesh.boundaryMesh(); labelListIOList finalAgglom @@ -70,12 +80,12 @@ int main(int argc, char *argv[]) ); - // Read view factor dictionary - IOdictionary viewFactorDict + // Read control dictionary + IOdictionary agglomDict ( IOobject ( - "viewFactorsDict", + agglomDictName, runTime.constant(), mesh, IOobject::MUST_READ, @@ -83,8 +93,7 @@ int main(int argc, char *argv[]) ) ); - bool writeAgglo = - readBool(viewFactorDict.lookup("writeFacesAgglomeration")); + bool writeAgglom = readBool(agglomDict.lookup("writeFacesAgglomeration")); const polyBoundaryMesh& boundary = mesh.boundaryMesh(); @@ -97,13 +106,13 @@ int main(int argc, char *argv[]) if (pp.size() > 0 && !pp.coupled()) { - if (viewFactorDict.found(pp.name())) + if (agglomDict.found(pp.name())) { - Info << "\nAgglomerating name : " << pp.name() << endl; + Info << "\nAgglomerating patch : " << pp.name() << endl; pairPatchAgglomeration agglomObject ( pp, - viewFactorDict.subDict(pp.name()) + agglomDict.subDict(pp.name()) ); agglomObject.agglomerate(); finalAgglom[patchI] = @@ -111,19 +120,15 @@ int main(int argc, char *argv[]) } else { - FatalErrorIn - ( - "main(int argc, char *argv[])" - ) << pp.name() - << " not found in dictionary : " - << viewFactorDict.name() - << exit(FatalError); + FatalErrorIn(args.executable()) + << "Patch " << pp.name() << " not found in dictionary: " + << agglomDict.name() << exit(FatalError); } } } // Sync agglomeration across coupled patches - labelList nbrAgglom(mesh.nFaces()-mesh.nInternalFaces(), -1); + labelList nbrAgglom(mesh.nFaces() - mesh.nInternalFaces(), -1); forAll(boundary, patchId) { @@ -133,7 +138,7 @@ int main(int argc, char *argv[]) finalAgglom[patchId] = identity(pp.size()); forAll(pp, i) { - nbrAgglom[pp.start()-mesh.nInternalFaces()+i] = + nbrAgglom[pp.start() - mesh.nInternalFaces() + i] = finalAgglom[patchId][i]; } } @@ -148,14 +153,14 @@ int main(int argc, char *argv[]) forAll(pp, i) { finalAgglom[patchId][i] = - nbrAgglom[pp.start()-mesh.nInternalFaces()+i]; + nbrAgglom[pp.start() - mesh.nInternalFaces() + i]; } } } finalAgglom.write(); - if (writeAgglo) + if (writeAgglom) { volScalarField facesAgglomeration ( @@ -183,10 +188,13 @@ int main(int argc, char *argv[]) } } - Info << "\nWriting facesAgglomeration..." << endl; + Info << "\nWriting facesAgglomeration" << endl; facesAgglomeration.write(); } Info<< "End\n" << endl; return 0; } + + +// ************************************************************************* // diff --git a/applications/utilities/preProcessing/mapFields/mapFieldsDict b/applications/utilities/preProcessing/mapFields/mapFieldsDict index 6cf6af76e0..6ef7c8f0ec 100644 --- a/applications/utilities/preProcessing/mapFields/mapFieldsDict +++ b/applications/utilities/preProcessing/mapFields/mapFieldsDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object mapFieldsDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // List of pairs of source/target patches for mapping diff --git a/applications/utilities/preProcessing/setFields/setFieldsDict b/applications/utilities/preProcessing/setFields/setFieldsDict index e9872ee8c9..a254ac3781 100644 --- a/applications/utilities/preProcessing/setFields/setFieldsDict +++ b/applications/utilities/preProcessing/setFields/setFieldsDict @@ -12,7 +12,6 @@ FoamFile class dictionary; object setFieldsDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // defaultFieldValues diff --git a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H index 17de4fbf6c..fad039b3b2 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H +++ b/applications/utilities/preProcessing/viewFactorsGen/searchingEngine.H @@ -24,7 +24,7 @@ dict.add dict.add("mergeDistance", SMALL); labelHashSet includePatches; -forAll(patches, patchI) // +forAll(patches, patchI) { if (!isA(patches[patchI])) { diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index cd852f59c3..1cbaf9ca43 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -125,7 +125,6 @@ scalar calculateViewFactorFij (cosThetaI*cosThetaJ*dAjMag*dAiMag) /(sqr(rMag)*constant::mathematical::pi) ); - } @@ -152,7 +151,7 @@ void insertMatrixElements } -// Main program: +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { @@ -161,7 +160,7 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createNamedMesh.H" - // Read view factor dictionary + // Read view factor dictionary IOdictionary viewFactorDict ( IOobject @@ -180,8 +179,6 @@ int main(int argc, char *argv[]) const bool dumpRays = viewFactorDict.lookupOrDefault("dumpRays", false); - // Debug - // ~~~~~ const label debug = viewFactorDict.lookupOrDefault