diff --git a/.gitignore b/.gitignore
index 67ac189fcca1d9f32a9c445814f28bf0e2682863..7c8bce03feec4f13b689eaa7cd297c4fc5f08f42 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 0000000000000000000000000000000000000000..be5915a560a209cfb45d1e9d99e30febb2a71b4f
--- /dev/null
+++ b/README.html
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+lang="en" xml:lang="en">
+<head>
+<title>OpenFOAM README for version 2.0.0</title>
+<meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
+<meta name="generator" content="Org-mode"/>
+<meta name="generated" content="16th June 2011"/>
+<meta name="author" content="OpenCFD Ltd."/>
+<meta name="description" content=""/>
+<meta name="keywords" content=""/>
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+ html { font-family: Times, serif; font-size: 12pt; }
+ .title { text-align: center; }
+ .todo { color: red; }
+ .done { color: green; }
+ .tag { background-color: #add8e6; font-weight:normal }
+ .target { }
+ .timestamp { color: #bebebe; }
+ .timestamp-kwd { color: #5f9ea0; }
+ .right {margin-left:auto; margin-right:0px; text-align:right;}
+ .left {margin-left:0px; margin-right:auto; text-align:left;}
+ .center {margin-left:auto; margin-right:auto; text-align:center;}
+ p.verse { margin-left: 3% }
+ pre {
+ border: 1pt solid #AEBDCC;
+ background-color: #F3F5F7;
+ padding: 5pt;
+ font-family: courier, monospace;
+ font-size: 90%;
+ overflow:auto;
+ }
+ table { border-collapse: collapse; }
+ td, th { vertical-align: top; }
+ th.right { text-align:center; }
+ th.left { text-align:center; }
+ th.center { text-align:center; }
+ td.right { text-align:right; }
+ td.left { text-align:left; }
+ td.center { text-align:center; }
+ dt { font-weight: bold; }
+ div.figure { padding: 0.5em; }
+ div.figure p { text-align: center; }
+ textarea { overflow-x: auto; }
+ .linenr { font-size:smaller }
+ .code-highlighted {background-color:#ffff00;}
+ .org-info-js_info-navigation { border-style:none; }
+ #org-info-js_console-label { font-size:10px; font-weight:bold;
+ white-space:nowrap; }
+ .org-info-js_search-highlight {background-color:#ffff00; color:#000000;
+ font-weight:bold; }
+ /*]]>*/-->
+</style>
+<script type="text/javascript">
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+ var target = document.getElementById(id);
+ if(null != target) {
+ elem.cacheClassElem = elem.className;
+ elem.cacheClassTarget = target.className;
+ target.className = "code-highlighted";
+ elem.className = "code-highlighted";
+ }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+ var target = document.getElementById(id);
+ if(elem.cacheClassElem)
+ elem.className = elem.cacheClassElem;
+ if(elem.cacheClassTarget)
+ target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+
+</head>
+<body>
+<div id="content">
+
+<h1 class="title">OpenFOAM README for version 2.0.0</h1>
+
+<div id="table-of-contents">
+<h2>Table of Contents</h2>
+<div id="text-table-of-contents">
+<ul>
+<li><a href="#sec-1">1 About OpenFOAM </a></li>
+<li><a href="#sec-2">2 Copyright </a></li>
+<li><a href="#sec-3">3 Download and installation instructions </a></li>
+<li><a href="#sec-4">4 Release notes </a></li>
+<li><a href="#sec-5">5 Documentation </a></li>
+<li><a href="#sec-6">6 Support and development contracts </a></li>
+<li><a href="#sec-7">7 Reporting Bugs in OpenFOAM </a></li>
+</ul>
+</div>
+</div>
+
+<div id="outline-container-1" class="outline-2">
+<h2 id="sec-1"><span class="section-number-2">1</span> About OpenFOAM </h2>
+<div class="outline-text-2" id="text-1">
+
+<p> 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.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-2" class="outline-2">
+<h2 id="sec-2"><span class="section-number-2">2</span> Copyright </h2>
+<div class="outline-text-2" id="text-2">
+
+<p> 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 <code>COPYING</code> in this directory or
+ <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>, for a description of the GNU General Public
+ License terms under which you can copy the files.
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-3" class="outline-2">
+<h2 id="sec-3"><span class="section-number-2">3</span> Download and installation instructions </h2>
+<div class="outline-text-2" id="text-3">
+
+<ul>
+<li>To install the Ubuntu/Debian (.deb) pack, see
+ <a href="http://www.OpenFOAM.com/download/ubuntu.php">http://www.OpenFOAM.com/download/ubuntu.php</a>
+</li>
+<li>To install the source (.gtgz) pack, see
+ <a href="http://www.OpenFOAM.com/download/source.php">http://www.OpenFOAM.com/download/source.php</a>
+</li>
+<li>To install from the Git repository, see
+ <a href="http://www.OpenFOAM.com/download/git.php">http://www.OpenFOAM.com/download/git.php</a>
+</li>
+</ul>
+
+
+</div>
+
+</div>
+
+<div id="outline-container-4" class="outline-2">
+<h2 id="sec-4"><span class="section-number-2">4</span> Release notes </h2>
+<div class="outline-text-2" id="text-4">
+
+<p> <a href="http://www.OpenFOAM.com/version2.0.0">http://www.OpenFOAM.com/version2.0.0</a>
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-5" class="outline-2">
+<h2 id="sec-5"><span class="section-number-2">5</span> Documentation </h2>
+<div class="outline-text-2" id="text-5">
+
+<p> <a href="http://www.OpenFOAM.com/docs">http://www.OpenFOAM.com/docs</a>
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-6" class="outline-2">
+<h2 id="sec-6"><span class="section-number-2">6</span> Support and development contracts </h2>
+<div class="outline-text-2" id="text-6">
+
+<p> <a href="http://www.OpenFOAM.com/support">http://www.OpenFOAM.com/support</a>
+</p>
+</div>
+
+</div>
+
+<div id="outline-container-7" class="outline-2">
+<h2 id="sec-7"><span class="section-number-2">7</span> Reporting Bugs in OpenFOAM </h2>
+<div class="outline-text-2" id="text-7">
+
+<p> <a href="http://www.OpenFOAM.com/bugs">http://www.OpenFOAM.com/bugs</a>
+</p></div>
+</div>
+<div id="postamble">
+<p class="date">Date: 16th June 2011</p>
+<p class="creator">Org version 7.5 with Emacs version 23</p>
+<a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a>
+</div>
+</div>
+</body>
+</html>
diff --git a/README.org b/README.org
new file mode 100644
index 0000000000000000000000000000000000000000..236d3299c177cf060a8cb0b386b93637c90d0f9b
--- /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 b49004337dbebd65308b1ad31a22b30617bc47bc..0000000000000000000000000000000000000000
--- 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<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
-
- 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 <dir> 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 <zone>_sidePatch
- + extrude edges inbetween different faceZones as a
- (nonuniformTransform)cyclic <zoneA>_<zoneB>
- + 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<volScalarField>("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 808b964e4fd1a5762155eedd5e5a82c540ce2fde..8e4a12ee0d01af803b9a615c0852547c76bc0e9e 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 fdbefa9b2f86b7f01b06409ef6122cfd6d8cdc26..765dd666ce3de801e68f403ce56e11f6087f03c9 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 dc4d5655cf846b7aa874876cac0a6eda712f68d6..45fc95065b15b4bf90adcfda99bfa5b196352134 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 1a2876049125e32f264d9dfff3a98f87a07bd7e3..8ee437b871764b111e4845b532328e13f4582f19 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::volScalarField> Foam::SchaefferFrictionalStress::muf
}
}
+ muff.correctBoundaryConditions();
+
return tmuf;
}
diff --git a/applications/test/codeStream/codeStreamDict1 b/applications/test/codeStream/codeStreamDict1
index 59eb3d43f66fcab1d2a1d701380bd9000c89a1d8..ea0c882cf5828bf0e1ff237383c54c565fd6134a 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 405e346e80b50781952f65f4605e6697f215cba4..a071d9557c9a05f70dd5fd00bb3b0d548e04e859 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 fe7ce2d7a6f2e161e6c2ba5a4c38429f02e4c0f2..1af465358de9c83760bcf40a74871a6dd9ef947e 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 28679b993e124473f1a99ce4c00385d18f23b113..5baa71d9796d3cc535ddd7d9ceb07759c357d9fc 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 3e091a4d7f38de13e12189b75ef361b38746abb0..2f3d2600f6e36f104000dc76508469191dcd79d4 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 1570a9377ecf2e20596ae3a8c953c470641a242d..c1239ff7aa59aa8600e7ddff1c741f157f70188c 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 8f6e5e2acd552d8825d0f855590a5ff9293586a9..9000df4c50c1273b8750c7fd8db8b62f8d36db5a 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 1282c7ee2274f349aa0b2f47bfdc0f26ea7dd0eb..bc5776aff6fbc581e0b44b20b2b985ad89a6dc42 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 3ae07af37ce26f9601d7b67c809245cefa5d9a6a..2cd9c50958cc63c2215964429ef5bbb4051d1423 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 342128a2f5d38cb440738fea46993f5428f359cc..bb421181b9389faf99403d0f2751f8ce3bf5fe6e 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 806c24f5803c1a4ee2352d93cd8a3d1432ad325f..d9eb0d474c48ccbb9560538b32bffdd722d24e45 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 01628a0429303ab226bf945984380c24fadef48d..a9ebc76a94d3ec58df859c1839944971c3c493fb 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 1a3e3f0bebcc26a72b0d73346e1533f8dad58458..143269548b3a0d99241049ca6c1d19fb813fde86 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 d2ec69054216b212c4291701ade2fe3864551a9d..fb2d6bae6c0ff2b36b4789d0eb1b1275dfad36ad 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 983a8907555f669517fd57a173affc590d084e36..fbd26416b8cbf4a07a8f579c760fe9d7531ff47e 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 b50a6147132f3da4de196365d0d7eb87fa663747..23f6d32c234ed26389a00b6217b09986cd3539d1 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 60719b72c37963bb612a10c0d4664af4dd1ee6b7..1765148a3983fdeeaddec2411b818ba2cf3d51ae 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 4fed4df2c0d1e5c5b00a0e43eef830b2309e74c2..0c6a0170dfa7f541ce3b828a56c358401e765447 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 028fcd32db45e9b30c78bea212aed1df346e36e3..6bd8d518458a37b907a210f521dc3dd90e02bb5a 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 e08341880b7e3b599b49ecd7e762eca496efe502..34ea6ed4f1920fd9ecc2e3040d80b041ad155a44 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 94a3b75c1f902cfa10be5e513013749ba8be43bb..eacccaecc3a3829cd28ee58ffeec1c440baacb74 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 36a6ad2eb4c10fe1ff21a4dc5f2c6af8a3465034..95a471844b69c22ef43bd6aebca7c7be9752e7ed 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 2c6b9a3d8353b512563ee983604b647da37222ad..4f7811d9797885e421942290c303e443844e6dbe 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 2183c4cbf702e832bda34cc2b0c9e52bfb910757..2b97c12e57210b503713d991a483bedc8c19bf92 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 58ca1d12eb1164b8fe4327ee9b033b3e58e5fa20..98c16ebe4edd67097487007dec09cc146df93a7c 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 f9cc0445359404574ca5e08c4d35504f7ffbc87b..fc5f2d39bc9160db0adbf9633cccb99a4f997a10 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 22c859f31f00fe194c7e5042c7e492032934b725..32961a5d45abcdde371ff99ae595e0c333b1022c 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 bd6a4c9c93f2cb04ba7cb3965cee5b60893aec53..af047efe7aa2b9eae84d4a1c44b3d7163957e76a 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 e413b94cc4df8812b5ceb5d5439b9d057e06ef3e..becaae12f7179fa405c3a93cc65758c4783f05fc 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 f71df8c6f3f19f85e7398039df3f09572f155eef..387b791592a7f036f8a33598b84b60eb1a065bf1 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<word>("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 6cf6af76e0b95be37cb5831745276272a990ca7f..6ef7c8f0ecd672576c0f36da37cc7a3da7385260 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 e9872ee8c909890d0913963e73ce3e10088ae276..a254ac378128d9203c42503439e841c5d200de4a 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 17de4fbf6cf10261608166d93f9e2de07a850243..fad039b3b2ca8208383ee779fe92b572ec1d6dff 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<processorPolyPatch>(patches[patchI]))
{
diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
index cd852f59c3a721556068e4b468b4de130539462f..1cbaf9ca43676824513050f6fc95aeaf17e6be89 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<bool>("dumpRays", false);
- // Debug
- // ~~~~~
const label debug = viewFactorDict.lookupOrDefault<label>("debug", 0);
volScalarField Qr
@@ -197,7 +194,7 @@ int main(int argc, char *argv[])
mesh
);
- // Read agglomeration map
+ // Read agglomeration map
labelListIOList finalAgglom
(
IOobject
@@ -211,8 +208,8 @@ int main(int argc, char *argv[])
)
);
- // - Create the coarse mesh using agglomeration //
- //-----------------------------------------------//
+ // Create the coarse mesh using agglomeration
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if (debug)
{
@@ -234,8 +231,8 @@ int main(int argc, char *argv[])
);
- // - Calculate total number of fine and coarse faces //
- //---------------------------------------------------//
+ // Calculate total number of fine and coarse faces
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
label nCoarseFaces = 0; //total number of coarse faces
label nFineFaces = 0; //total number of fine faces
@@ -264,7 +261,7 @@ int main(int argc, char *argv[])
viewFactorsPatches.resize(count--);
- //total number of coarse faces
+ // total number of coarse faces
label totalNCoarseFaces = nCoarseFaces;
reduce(totalNCoarseFaces, sumOp<label>());
@@ -280,8 +277,8 @@ int main(int argc, char *argv[])
<< viewFactorsPatches << endl;
}
- // - Collect local Cf and Sf on coarse mesh //.
- //------------------------------------------//
+ // Collect local Cf and Sf on coarse mesh
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DynamicList<point> localCoarseCf(nCoarseFaces);
DynamicList<point> localCoarseSf(nCoarseFaces);
@@ -348,8 +345,8 @@ int main(int argc, char *argv[])
}
}
- // - Collect remote Cf and Sf on coarse mesh //.
- //------------------------------------------//
+ // Collect remote Cf and Sf on coarse mesh
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
List<pointField> remoteCoarseCf(Pstream::nProcs());
List<pointField> remoteCoarseSf(Pstream::nProcs());
@@ -357,8 +354,8 @@ int main(int argc, char *argv[])
remoteCoarseCf[Pstream::myProcNo()] = localCoarseCf;
remoteCoarseSf[Pstream::myProcNo()] = localCoarseSf;
- // - Collect remote Cf and Sf on fine mesh //.
- //------------------------------------------//
+ // Collect remote Cf and Sf on fine mesh
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
List<pointField> remoteFineCf(Pstream::nProcs());
List<pointField> remoteFineSf(Pstream::nProcs());
@@ -366,8 +363,8 @@ int main(int argc, char *argv[])
remoteCoarseCf[Pstream::myProcNo()] = localCoarseCf;
remoteCoarseSf[Pstream::myProcNo()] = localCoarseSf;
- // Distribute local coarse Cf and Sf for shooting rays
- // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ // Distribute local coarse Cf and Sf for shooting rays
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Pstream::gatherList(remoteCoarseCf);
Pstream::scatterList(remoteCoarseCf);
@@ -377,43 +374,39 @@ int main(int argc, char *argv[])
// Set up searching engine for obstacles
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # include "searchingEngine.H"
+ #include "searchingEngine.H"
// Determine rays between coarse face centres
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- DynamicList<label> rayStartFace
- (
- nCoarseFaces
- + 0.01*nCoarseFaces
- );
+ DynamicList<label> rayStartFace(nCoarseFaces + 0.01*nCoarseFaces);
- DynamicList<label> rayEndFace(rayStartFace.size());
+ DynamicList<label> rayEndFace(rayStartFace.size());
- globalIndex globalNumbering(nCoarseFaces);
+ globalIndex globalNumbering(nCoarseFaces);
- //- Return rayStartFace in local index andrayEndFace in global index //
- // ------------------------------------------------------------------//
+ // Return rayStartFace in local index andrayEndFace in global index
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- # include "shootRays.H"
+ #include "shootRays.H"
- // Calculate number of visible faces from local index
- labelList nVisibleFaceFaces(nCoarseFaces, 0);
+ // Calculate number of visible faces from local index
+ labelList nVisibleFaceFaces(nCoarseFaces, 0);
- forAll(rayStartFace, i)
- {
- nVisibleFaceFaces[rayStartFace[i]]++;
- }
+ forAll(rayStartFace, i)
+ {
+ nVisibleFaceFaces[rayStartFace[i]]++;
+ }
- labelListList visibleFaceFaces(nCoarseFaces);
+ labelListList visibleFaceFaces(nCoarseFaces);
- label nViewFactors = 0;
- forAll(nVisibleFaceFaces, faceI)
- {
- visibleFaceFaces[faceI].setSize(nVisibleFaceFaces[faceI]);
- nViewFactors += nVisibleFaceFaces[faceI];
- }
+ label nViewFactors = 0;
+ forAll(nVisibleFaceFaces, faceI)
+ {
+ visibleFaceFaces[faceI].setSize(nVisibleFaceFaces[faceI]);
+ nViewFactors += nVisibleFaceFaces[faceI];
+ }
// - Construct compact numbering
@@ -474,9 +467,9 @@ int main(int argc, char *argv[])
consMapDim.write();
- // visibleFaceFaces has:
- // (local face, local viewed face) = compact viewed face
- //------------------------------------------------------------//
+ // visibleFaceFaces has:
+ // (local face, local viewed face) = compact viewed face
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nVisibleFaceFaces = 0;
forAll(rayStartFace, i)
@@ -489,7 +482,7 @@ int main(int argc, char *argv[])
// Construct data in compact addressing
// I need coarse Sf (Ai), fine Sf (dAi) and fine Cf(r) to calculate Fij
- // --------------------------------------------------------------------//
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pointField compactCoarseCf(map.constructSize(), pTraits<vector>::zero);
pointField compactCoarseSf(map.constructSize(), pTraits<vector>::zero);
@@ -560,7 +553,7 @@ int main(int argc, char *argv[])
// Fill local view factor matrix
- //-----------------------------
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
scalarListIOList F
(
@@ -591,7 +584,7 @@ int main(int argc, char *argv[])
if (Pstream::master())
{
- Info << "\nCalculating view factors..." << endl;
+ Info<< "\nCalculating view factors..." << endl;
}
if (mesh.nSolutionD() == 3)
@@ -606,7 +599,7 @@ int main(int argc, char *argv[])
const labelList& visCoarseFaces = visibleFaceFaces[coarseFaceI];
- forAll (visCoarseFaces, visCoarseFaceI)
+ forAll(visCoarseFaces, visCoarseFaceI)
{
F[coarseFaceI].setSize(visCoarseFaces.size());
label compactJ = visCoarseFaces[visCoarseFaceI];
@@ -647,7 +640,7 @@ int main(int argc, char *argv[])
const boundBox& box = mesh.bounds();
const Vector<label>& dirs = mesh.geometricD();
vector emptyDir = vector::zero;
- forAll (dirs, i)
+ forAll(dirs, i)
{
if (dirs[i] == -1)
{
@@ -657,7 +650,7 @@ int main(int argc, char *argv[])
scalar wideBy2 = (box.span() & emptyDir)*2.0;
- forAll (localCoarseSf, coarseFaceI)
+ forAll(localCoarseSf, coarseFaceI)
{
const vector& Ai = localCoarseSf[coarseFaceI];
const vector& Ci = localCoarseCf[coarseFaceI];
@@ -709,10 +702,10 @@ int main(int argc, char *argv[])
if (Pstream::master() && debug)
{
- forAll (viewFactorsPatches, i)
+ forAll(viewFactorsPatches, i)
{
label patchI = viewFactorsPatches[i];
- forAll (viewFactorsPatches, i)
+ forAll(viewFactorsPatches, i)
{
label patchJ = viewFactorsPatches[i];
Info << "F" << patchI << patchJ << ": "
@@ -749,7 +742,7 @@ int main(int argc, char *argv[])
const labelList& coarsePatchFace =
coarseMesh.patchFaceMap()[patchID];
- forAll (coarseToFine, coarseI)
+ forAll(coarseToFine, coarseI)
{
const scalar Fij = sum(F[compactI]);
const label coarseFaceID = coarsePatchFace[coarseI];
@@ -858,4 +851,5 @@ int main(int argc, char *argv[])
return 0;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
index e74c77ac484b58a4c5fca76dccb64f2f873a70e8..d0fb404f6048961758f06b45816db4f2b70d6a70 100644
--- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
+++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionDict
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object wallFunctionDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -35,5 +34,4 @@ SpaldingsLawCoeffs
E 9.8;
}
-
// ************************************************************************* //
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
index 228260615d25e0700596be4f16093d49abb58c80..0f21b7b1de0ed77e76a1146be0307caf1da4a7bf 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubsetDict
@@ -12,7 +12,6 @@ FoamFile
class dictionary;
object surfaceSubsetDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Select triangles by label
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/controlDict b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
index 222df1c3e9a3a6267e001ec1689c9b9f9debfd72..214c866ba2bcc3fe43324026eb7adda2b885fac3 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/controlDict
+++ b/applications/utilities/thermophysical/adiabaticFlameT/controlDict
@@ -13,7 +13,6 @@ FoamFile
class dictionary;
object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
T0 300.0;
@@ -60,10 +59,8 @@ C7H16
m 16;
}
-
$H2;
// $CH4;
// $PROPANE;
-
// ************************************************************************* //
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/controlDict b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
index 60d39af4df8c375f0ab5615838a83a4d22c7de7f..3477fbb9ca840d1430739098228f5fb0aabb4b18 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/controlDict
+++ b/applications/utilities/thermophysical/equilibriumFlameT/controlDict
@@ -13,7 +13,6 @@ FoamFile
class dictionary;
object controlDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
P 1e5;
@@ -60,10 +59,8 @@ C7H16
m 16;
}
-
$H2;
// $CH4;
// $PROPANE;
-
// ************************************************************************* //
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index f210685a7381339869d365fcba9e7a6f55da81b8..67a7edf6edc413b9ce591b708d7cc638b220c919 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -3,7 +3,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
@@ -32,8 +32,6 @@
#------------------------------------------------------------------------------
# Base settings
-FOAM_VERSION=1.6
-SUPPLIED_VERSION_GCC=4.4.3
MIN_VERSION_GCC=4.3.3
# General
@@ -247,19 +245,54 @@ reportExecutable()
VERSION=`$1 -case /dev/null 2>&1 \
| sed -ne 's/^.*Version: *\([^ ][^ ]*\).*/\1/p'`
;;
+ flex)
+ VERSION=`$1 --version /dev/null 2>&1 \
+ | sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p' `
+ ;;
gcc)
- VERSION=`$1 -v 2>&1 \
+ VERSION=`$1 -v 2>&1 \
| sed -ne 's/^gcc version \([0-9][0-9.]*\).*/\1/p' `
- if [ "$VERSION" != "$SUPPLIED_VERSION_GCC" ]
- then
- echo "WARNING: gcc version does not match gcc supplied" \
- "with this release of OpenFOAM"
- echo " Supplied version: $SUPPLIED_VERSION_GCC"
- echo " User version : $VERSION"
- echo " Minimum required: $MIN_VERSION_GCC"
+ MINV1=`echo $MIN_VERSION_GCC | cut -d. -f1`
+ MINV2=`echo $MIN_VERSION_GCC | cut -d. -f2`
+ MINV3=`echo $MIN_VERSION_GCC | cut -d. -f3`
+
+ V1=`echo $VERSION | cut -d. -f1`
+ V2=`echo $VERSION | cut -d. -f2`
+ V3=`echo $VERSION | cut -d. -f3`
+
+
+ gccOK=""
+ pass=""
+ if [ $V1 -lt $MINV1 ]; then
+ gccOk="ERROR"
+ elif [ $V1 -gt $MINV1 ]; then
+ pass="yes"
+ fi
+
+ if [ "$pass" == "" ] && [ "$gccOk" == "" ]; then
+ if [ $V2 -lt $MINV2 ]; then
+ gccOk="ERROR"
+ elif [ $V2 -gt $MINV2 ]; then
+ pass="yes"
+ fi
+ fi
+
+ if [ "$pass" == "" ] && [ "$gccOk" == "" ] && [ $V3 != "" ] && [ $MINV3 != "" ]; then
+ if [ $V3 -lt $MINV3 ]; then
+ gccOk="ERROR"
+ fi
+ fi
+
+ if [ "$gccOk" != "" ]; then
+ echo "ERROR: gcc version is too old for this release of OpenFOAM"
+ echo " User version : $VERSION"
+ echo " Minimum required: $MIN_VERSION_GCC"
echo ""
+ fatalError=`expr $fatalError + 1`
fi
+
+
;;
gtar)
VERSION=`$APP_PATH --version | head -1`
@@ -304,7 +337,7 @@ checkOpenFOAMEnvironment()
echo "FATAL ERROR: OpenFOAM environment not configured."
echo ""
echo " Please refer to the installation section of the README file:"
- echo " <OpenFOAM installation dir>/OpenFOAM-${FOAM_VERSION}/README"
+ echo " <OpenFOAM installation dir>/OpenFOAM-${WM_PROJECT_VERSION}/README"
echo " to source the OpenFOAM environment."
echo ""
exit 1
@@ -320,7 +353,7 @@ checkUserShell()
;;
*)
echo "FATAL ERROR: Cannot identify the shell you are running."
- echo " OpenFOAM ${FOAM_VERSION} is compatible with "
+ echo " OpenFOAM ${WM_PROJECT_VERSION} is compatible with "
echo " csh, tcsh, ksh and bash."
echo
fatalError=`expr $fatalError + 1`
@@ -336,7 +369,7 @@ checkHostName()
then
echo "FATAL ERROR: Cannot stat hostname."
echo " Contact your system administrator, "
- echo " OpenFOAM ${FOAM_VERSION} needs a valid "
+ echo " OpenFOAM ${WM_PROJECT_VERSION} needs a valid "
echo " hostname to function."
echo
fatalError=`expr $fatalError + 1`
@@ -352,7 +385,7 @@ checkOS()
;;
*)
echo "FATAL ERROR: Incompatible operating system \"$OSTYPE\"."
- echo " OpenFOAM $FOAM_VERSION is currently "
+ echo " OpenFOAM ${FWM_PROJECT_VERSION} is currently "
echo " available for Linux and SunOS only."
echo
fatalError=`expr $fatalError + 1`
@@ -423,6 +456,7 @@ COL3=`fixlen Location 10`
hline
echo "$COL1 $COL2 $COL3"
hline
+reportExecutable flex
reportExecutable gcc
reportExecutable gzip
if [ "$OSTYPE" = Linux ]
diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index 2893be0a2c5537bb1fdb204ac677f2cc25fbb3dd..d98b87ccb15ca53731ac7f99c1e178e424e41dad 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -38,29 +38,29 @@
# normally use "make"
make="make"
-# set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
-if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
-then
- WM_NCOMPPROCS=$(wmakeScheduler -count)
- [ $? -eq 0 ] || unset WM_NCOMPPROCS
-fi
-
-if [ "$WM_NCOMPPROCS" ]
-then
- if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ]
- then
- lockDir=$HOME/.$WM_PROJECT/.wmake
-
- if [ -d $lockDir ]
- then
- rm -f $lockDir/*
- else
- mkdir -p $lockDir
- fi
-
- make="make --no-print-directory -j "$WM_NCOMPPROCS
- fi
-fi
+## set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
+#if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
+#then
+# WM_NCOMPPROCS=$(wmakeScheduler -count)
+# [ $? -eq 0 ] || unset WM_NCOMPPROCS
+#fi
+#
+#if [ "$WM_NCOMPPROCS" ]
+#then
+# if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ]
+# then
+# lockDir=$HOME/.$WM_PROJECT/.wmake
+#
+# if [ -d $lockDir ]
+# then
+# rm -f $lockDir/*
+# else
+# mkdir -p $lockDir
+# fi
+#
+# make="make --no-print-directory -j "$WM_NCOMPPROCS
+# fi
+#fi
@@ -103,7 +103,8 @@ else
# fi
#done
FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs)
- $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript"
+ #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript"
+ $make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$thisScript"
fi
#------------------------------------------------------------------------------
diff --git a/bin/foamSystemCheck b/bin/foamSystemCheck
index 7a0a66c14ea9e058d4789709ae40a816acf36e71..003e60e1f35c60481639f62935faf766c905a555 100755
--- a/bin/foamSystemCheck
+++ b/bin/foamSystemCheck
@@ -3,7 +3,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
@@ -33,8 +33,6 @@
# STATIC VARIABLES
# ~~~~~~~~~~~~~~~~
-FOAM_VERSION=1.6
-
HLINE="-----------------------------------------------------------------------"
WIDTH=16
unset fatalError
@@ -92,7 +90,7 @@ case "$SHELL" in
;;
*)
echo "ERROR: Cannot identify the current shell."
- echo " OpenFOAM $FOAM_VERSION is compatible"
+ echo " OpenFOAM $WM_PROJECT_VERSION is compatible"
echo " with csh, tcsh, ksh and bash."
echo
fatalError=true
@@ -105,8 +103,8 @@ echo "$(fixlen Host: $WIDTH) $HOST"
if [ $(length $HOST) -eq 0 ]
then
echo "ERROR: Cannot stat hostname."
- echo " OpenFOAM $FOAM_VERSION needs a valid hostname to function."
- echo " Contact your system administrator. "
+ echo " OpenFOAM $WM_PROJECT_VERSION needs a valid hostname to"
+ echo " function. Contact your system administrator."
echo
fatalError=true
fi
@@ -119,7 +117,7 @@ Linux | LinuxAMD64 | SunOS )
;;
*)
echo "ERROR: Incompatible operating system \"$OSTYPE\"."
- echo " OpenFOAM $FOAM_VERSION is currently available for "
+ echo " OpenFOAM $WM_PROJECT_VERSION is currently available for "
echo " Linux, LinuxAMD64 and SunOS only."
echo
fatalError=true
@@ -138,7 +136,7 @@ echo "$(fixlen User: $WIDTH) ${USER_NAME}"
if [ $(length $USER_NAME) -eq 0 ]
then
echo "ERROR: Cannot stat user name $USER_NAME."
- echo " OpenFOAM $FOAM_VERSION needs a valid user name."
+ echo " OpenFOAM $WM_PROJECT_VERSION needs a valid user name."
echo " Contact your system administrator. "
echo
fatalError=true
diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 9526748f07bc28b66561db5c0a29bff1dfebcefd..d5fe1ba0ff7f971e741920ebc82c591eeab2d190 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -107,13 +107,13 @@ do
shift 2
;;
--projectVersion)
- [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
- projectVersion="$2"
- # replace WM_PROJECT_VERSION=...
- _inlineSed \
- etc/bashrc \
- '/^[^#]/s@WM_PROJECT_VERSION=.*@WM_PROJECT_VERSION='"$projectVersion@" \
- "Replacing WM_PROJECT_VERSION setting by $projectVersion"
+# [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+# projectVersion="$2"
+# # replace WM_PROJECT_VERSION=...
+# _inlineSed \
+# etc/bashrc \
+# '/^[^#]/s@WM_PROJECT_VERSION=.*@WM_PROJECT_VERSION='"$projectVersion@" \
+# "Replacing WM_PROJECT_VERSION setting by $projectVersion"
shift 2
;;
-archOption | --archOption)
diff --git a/bin/tools/foamListSourceFiles b/bin/tools/foamListSourceFiles
index ef6c166e4ccf1e369ad5c67aae37d91890bca657..60ef4355357797544228a18e784ccfc55de5eaef 100755
--- a/bin/tools/foamListSourceFiles
+++ b/bin/tools/foamListSourceFiles
@@ -79,7 +79,6 @@ find -H $packDir \
| sed \
-e '\@/\.git/@d' \
-e '\@/\.tags/@d' \
- -e '\@/README\.org@d' \
-e '\@/platforms/@d' \
-e '\@/t/@d' \
-e '\@/Make[.A-Za-z]*/[^/]*/@d' \
diff --git a/bin/tools/foamLog.db b/bin/tools/foamLog.db
index 49d551f32c42fdac5f9e3b0944a983d2cee8e96c..f4c05bc010b232729b7df81736d0add1b7a42a3e 100644
--- a/bin/tools/foamLog.db
+++ b/bin/tools/foamLog.db
@@ -48,6 +48,6 @@ epsMax/bounding epsilon,/max:
epsAvg/bounding epsilon,/average:
#- gamma bounding
-gammaMin/Min\(gamma\) =/Min(gamma) =
-gammaMax/Max\(gamma\) =/Max(gamma) =
+alpha1Min/Min\(alpha1\) =/Min(alpha1) =
+alpha1Max/Max\(alpha1\) =/Max(alpha1) =
diff --git a/doc/Doxygen/Allwmake b/doc/Doxygen/Allwmake
index a34eb3fd7e0cce80561fd61bc768738bb5e0cd02..fbc20d93fd054d2fa63b80606e6f0e36924c027e 100755
--- a/doc/Doxygen/Allwmake
+++ b/doc/Doxygen/Allwmake
@@ -1,5 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
+
+[ -d "$WM_PROJECT_DIR" ] || {
+ echo "Error: WM_PROJECT_DIR directory does not exist"
+ echo " Check the OpenFOAM entries in your dot-files and source them."
+ echo " WM_PROJECT_DIR=$WM_PROJECT_DIR"
+ exit 1
+}
+
set -x
rm -rf latex man
diff --git a/doc/Doxygen/Doxyfile b/doc/Doxygen/Doxyfile
index 3ef243ee83b0f2d31a32c3c3bf554e2751335afa..7c72c4595e92c3d02b24dfe96b7d99b0686d0840 100644
--- a/doc/Doxygen/Doxyfile
+++ b/doc/Doxygen/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.3
+# Doxyfile 1.6.3
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
@@ -14,11 +14,11 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
@@ -54,10 +54,11 @@ CREATE_SUBDIRS = NO
# information to generate all constant output in the proper language.
# The default language is English, other supported languages are:
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -128,7 +129,7 @@ STRIP_FROM_INC_PATH =
# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
-SHORT_NAMES = NO
+SHORT_NAMES = YES
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style
@@ -154,13 +155,6 @@ QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = YES
-
# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
# member inherits the documentation from any documented member that it
# re-implements.
@@ -195,14 +189,39 @@ ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
# func(std::string) {}). This also make the inheritance and collaboration
@@ -215,6 +234,21 @@ BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen to replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
# tag is set to YES, then doxygen will reuse the documentation of the first
# member in the group (if any) for the other members of the group. By default
@@ -230,6 +264,32 @@ DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
@@ -264,10 +324,11 @@ EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
-# If this flag is set to YES, the members of anonymous namespaces will be extracted
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
-# where file will be replaced with the base name of the file that contains the anonymous
-# namespace. By default anonymous namespace are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
EXTRACT_ANON_NSPACES = NO
@@ -327,6 +388,12 @@ HIDE_SCOPE_NAMES = YES
SHOW_INCLUDE_FILES = NO
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
@@ -346,6 +413,21 @@ SORT_MEMBER_DOCS = NO
SORT_BRIEF_DOCS = NO
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO (the default) the constructors will
+# appear in the respective orders defined by SORT_MEMBER_DOCS and
+# SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is
+# set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
# sorted by fully-qualified names, including namespaces. If set to
# NO (the default), the class list will be sorted only by class name,
@@ -407,9 +489,22 @@ SHOW_USED_FILES = YES
SHOW_DIRECTORIES = YES
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from the
-# version control system). Doxygen will invoke the program by executing (via
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
# popen()) the command <command> <input-file>, where <command> is the value of
# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
# provided by doxygen. Whatever the program writes to standard output
@@ -417,6 +512,15 @@ SHOW_DIRECTORIES = YES
FILE_VERSION_FILTER =
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+
+LAYOUT_FILE =
+
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -481,10 +585,18 @@ INPUT = $(WM_PROJECT_DIR)/src \
$(WM_PROJECT_DIR)/applications/utilities \
$(WM_PROJECT_DIR)/applications/solvers
-# This tag can be used to specify the character encoding of the source files that
-# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default
-# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.
-# See http://www.gnu.org/software/libiconv for the list of possible encodings.
+# limit input for testing purposes
+# INPUT = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
+# $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
+# $(WM_PROJECT_DIR)/src/OpenFOAM/primitives \
+# $(WM_PROJECT_DIR)/sampling \
+# $(WM_PROJECT_DIR)/src/finiteVolume/fvMesh
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
INPUT_ENCODING = UTF-8
@@ -493,9 +605,10 @@ INPUT_ENCODING = UTF-8
# and *.h) to filter out the source-files in the directories. If left
# blank the following patterns are tested:
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-FILE_PATTERNS = *.H *.C
+FILE_PATTERNS = *.H \
+ *.C
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
@@ -521,14 +634,14 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS = */lnInclude/* \
+EXCLUDE_PATTERNS = */lnInclude/* \
*/t/*
-
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the output.
-# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,
-# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
EXCLUDE_SYMBOLS =
@@ -538,7 +651,6 @@ EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
-
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
# and *.h) to filter out the source-files in the directories. If left
@@ -564,14 +676,17 @@ IMAGE_PATH =
# by executing (via popen()) the command <filter> <input-file>, where <filter>
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
# ignored.
INPUT_FILTER = $(WM_PROJECT_DIR)/bin/tools/doxyFilter
# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
@@ -591,9 +706,7 @@ FILTER_SOURCE_FILES = NO
# If the SOURCE_BROWSER tag is set to YES then a list of source files will
# be generated. Documented entities will be cross-referenced with these sources.
# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH
-# then you must also enable this option. If you don't then doxygen will produce
-# a warning and turn it on anyway
+# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = YES
@@ -608,13 +721,13 @@ INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# If the REFERENCED_BY_RELATION tag is set to YES
# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES (the default)
+# If the REFERENCES_RELATION tag is set to YES
# then for each documented function all documented entities
# called/used by that function will be listed.
@@ -623,7 +736,8 @@ REFERENCES_RELATION = YES
# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentstion.
+# link to the source code.
+# Otherwise they will link to the documentation.
REFERENCES_LINK_SOURCE = YES
@@ -655,7 +769,7 @@ ALPHABETICAL_INDEX = YES
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
-COLS_IN_ALPHA_INDEX = 4
+COLS_IN_ALPHA_INDEX = 1
# In case all classes in a project start with a common prefix, all
# classes will be put under the same header in the alphabetical index.
@@ -673,6 +787,11 @@ IGNORE_PREFIX =
GENERATE_HTML = YES
+# If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will
+# add generated date, project name and doxygen version to HTML footer.
+
+HTML_FOOTER_DESCRIPTION= NO
+
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
@@ -689,13 +808,13 @@ HTML_FILE_EXTENSION = .html
# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
-HTML_HEADER = $(WM_PROJECT_DIR)/doc/Doxygen/FoamHeader.html
+HTML_HEADER = $(WM_PROJECT_DIR)/doc/Doxygen/_Header
# The HTML_FOOTER tag can be used to specify a personal HTML footer for
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER = $(WM_PROJECT_DIR)/doc/Doxygen/FoamFooter.html
+HTML_FOOTER = $(WM_PROJECT_DIR)/doc/Doxygen/_Footer
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
@@ -706,19 +825,18 @@ HTML_FOOTER = $(WM_PROJECT_DIR)/doc/Doxygen/FoamFooter.html
HTML_STYLESHEET =
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
# page has loaded. For this to work a browser that supports
@@ -727,6 +845,39 @@ GENERATE_HTMLHELP = NO
HTML_DYNAMIC_SECTIONS = NO
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment, introduced with OSX 10.5 (Leopard). To create a documentation
+# set, doxygen will generate a Makefile in the HTML output directory. Running
+# make will produce the docset in that directory and running "make install" will
+# install the docset in ~/Library/Developer/Shared/Documentation/DocSets so that
+# Xcode will find it at startup. See
+# http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more
+# information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
# be used to specify the file name of the resulting .chm file. You
# can add a path in front of the file if the result should not be
@@ -747,6 +898,12 @@ HHC_LOCATION =
GENERATE_CHI = NO
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
# controls whether a binary table of contents is generated (YES) or a
# normal table of contents (NO) in the .chm file.
@@ -758,6 +915,75 @@ BINARY_TOC = NO
TOC_EXPAND = NO
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom
+# filter to add.For more information please see <a
+# href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help
+# Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. <a
+# href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help
+# Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as the
+# ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the
+# help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
# top of each HTML page. The value NO (the default) enables the index and
# the value YES disables it.
@@ -769,29 +995,61 @@ DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 4
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
-# probably better off using the HTML help feature.
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
GENERATE_TREEVIEW = NO
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 250
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be
+# disabled. For large projects the javascript based search engine can be slow,
+# then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client using
+# Javascript. Doxygen will generate the search PHP script and index file to put
+# on the web server. The advantage of the server based approach is that it
+# scales better to large projects and allows full text search. The disadvances
+# is that it is more difficult to setup and does not have live searching
+# capabilities.
+
+SERVER_BASED_SEARCH = NO
+# old default
+# SERVER_BASED_SEARCH = YES
+
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-# Path for OpenCFD LaTeX macros
-
-@INCLUDE_PATH = $(WM_PROJECT_DIR)/doc/Doxygen/Macros/
-
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
@@ -805,6 +1063,9 @@ LATEX_OUTPUT = latex
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
LATEX_CMD_NAME = latex
@@ -864,6 +1125,12 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with
+# syntax highlighting in the LaTeX output. Note that which sources are shown
+# also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -1000,8 +1267,10 @@ GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
@@ -1088,9 +1357,11 @@ SKIP_FUNCTION_MACROS = YES
# Optionally an initial location of the external documentation
# can be added for each tagfile. The format of a tag file without
# this location is as follows:
-# TAGFILES = file1 file2 ...
+#
+# TAGFILES = file1 file2 ...
# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
# where "loc1" and "loc2" can be relative or absolute paths or
# URLs. If a location is present for each tag, the installdox tool
# does not have to be run to correct the links.
@@ -1137,10 +1408,11 @@ PERL_PATH = /usr/bin/perl
CLASS_DIAGRAMS = YES
# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to
-# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to
-# specify the directory where the mscgen tool resides. If left empty the tool is assumed to
-# be found in the default search path.
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
MSCGEN_PATH =
@@ -1157,6 +1429,29 @@ HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = YES
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This font
+# does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH =
+
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for each documented class showing the direct and
# indirect inheritance relations. Setting this tag to YES will force the
@@ -1201,19 +1496,19 @@ INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
-# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a call dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
CALL_GRAPH = YES
-# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will
-# generate a caller dependency graph for every global function or class method.
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
CALLER_GRAPH = YES
@@ -1246,15 +1541,15 @@ DOT_PATH =
DOTFILE_DIRS =
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
# nodes that will be shown in the graph. If the number of nodes in a graph
# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that if the number
-# of direct children of the root node in a graph is already larger than
-# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-DOT_GRAPH_MAX_NODES = 10
+DOT_GRAPH_MAX_NODES = 50
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
@@ -1264,13 +1559,13 @@ DOT_GRAPH_MAX_NODES = 10
# code bases. Also note that the size of a graph can be further restricted by
# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-MAX_DOT_GRAPH_DEPTH = 1
+MAX_DOT_GRAPH_DEPTH = 3
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, which results in a white background.
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
DOT_TRANSPARENT = YES
@@ -1292,12 +1587,3 @@ GENERATE_LEGEND = YES
# the various graphs.
DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = YES
diff --git a/doc/Doxygen/Doxygen.css b/doc/Doxygen/Doxygen.css
deleted file mode 100644
index 24955d35f27bbd8d1da537372f7b4fd3ac9bb0fb..0000000000000000000000000000000000000000
--- a/doc/Doxygen/Doxygen.css
+++ /dev/null
@@ -1,76 +0,0 @@
-body { color: #000000 ; background: #ffffff; margin: 0px; font-family: verdana, arial, helvetica, sans-serif; text-decoration: none; font-size: 12px; }
-a:link { text-decoration: none; color: #0000ff ; }
-a:link:hover { text-decoration: none; color: #0000ff ; }
-a:visited { text-decoration: none; color: #0000ff ; }
-a:visited:hover { text-decoration: none; color: #0000ff ; }
-a:link img { border: 0; }
-a:visited img { border: 0; }
-a:active img { border: 0; }
-a.menuLefton { color: #0000ff; font-size: 12px; font-weight: bold; }
-td.leftmenu { font-family: verdana, arial, helvetica, sans-serif; text-decoration: none; background: #ddddff; text-align: left; font-size: 14px; height: 20px; width: 200px; }
-a.menuTopoff { color: #000000; font-size: 14px; }
-a.menuTopoff:visited { color: #000000; font-size: 14px; }
-a.menuTopoff:hover { color: #0000ff; font-size: 14px; }
-td.topmenu { font-family: verdana, arial, helvetica, sans-serif; background: #ddddff; text-align: center; font-size: 16px; width: 150px; font-weight: bold; }
-h1 { font-size: 18px; }
-h2 { font-size: 16px; }
-h3 { font-size: 14px; }
-
-/* formatting for member functions:
- * Since the OpenFOAM code already has nice line-breaks, wrapping the lines
- * just looks terrible.
- * Give a slightly different background to make it easier to find.
-*/
-.memitem {
- padding: 4px;
- background-color: #eef3f5;
- border-width: 1px;
- border-style: solid;
- border-color: #dedeee;
-}
-
-.memproto {
- background-color: #d5e1e8;
- width: 100%;
- border-width: 1px;
- border-style: solid;
- border-color: #84b0c7;
- font-weight: bold;
-}
-
-table.memname {
- width: 100%;
- background: #f7f7ff;
- white-space: nowrap;
-}
-
-
-.indexkey {
- vertical-align: top;
- background: #f7f7ff;
-}
-
-.indexvalue {
- vertical-align: top;
- background: #f7f7ff;
-}
-
-.paramkey {
- width: 5%;
-}
-
-.memItemLeft {
- background: #f7f7ff;
-}
-
-.memItemRight {
- background: #f7f7ff;
-}
-
-.mdescLeft {
- margin: 0px;
-}
-
-.mdescRight {
- font-style: italic;
-}
diff --git a/doc/Doxygen/FoamFooter.html b/doc/Doxygen/FoamFooter.html
deleted file mode 100644
index 3e70a02e792365dc6bf344fbdc3ed0752370a497..0000000000000000000000000000000000000000
--- a/doc/Doxygen/FoamFooter.html
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright © 2000-2010 <a href="http://www.openfoam.com/about">OpenCFD Ltd.</a>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/doc/Doxygen/FoamHeader.html b/doc/Doxygen/FoamHeader.html
deleted file mode 100644
index e67053d4ae8051b27bbc996b0cd3c7e288b94c58..0000000000000000000000000000000000000000
--- a/doc/Doxygen/FoamHeader.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <title> OpenFOAM programmer's C++ documentation </title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<!-- html,info -->
-<link rel="stylesheet" type="text/css" href="../Doxygen.css">
-<link rel="stylesheet" type="text/css" href="../tabs.css">
-<link href="../OpenFOAMicon.png" type="image/png" rel="icon" />
-<meta name="keywords" content="computational fluid dynamics, CFD, OpenCFD, OpenFOAM, open source CFD, open source">
-<meta name="description" content="OpenCFD Ltd, leaders in open source Computational Fluid Dynamics (CFD), the developers and maintainers of OpenFOAM: the open source CFD toolbox. We supply support and contracted developments for OpenFOAM">
-</head>
-<body>
-<a id="openfoam"> </a>
-<!-- Top banner -->
-<table
- style="border-width: 0px; width: 800px; background: #ddddff;"
- cellspacing="0" cellpadding="0">
-<tr>
-<td style="width: 9px; height:54px"></td>
-<td style="width: 250px; height:54px; vertical-align:middle;
- horizontal-align: left;">
-<img alt="OpenFOAM logo" src="../OpenFOAMlogo.jpg"> </td>
-<td style="width:350px; height:54px; vertical-align:middle;
-horizontal-align: left; ">
- <table>
- <tr>
- <td><img alt="The Open Source CFD Toolbox" src="../OpenSourceToolbox.jpg"></td>
- </tr>
- </table>
-</td>
-</tr>
-</table>
-<!-- Button banner -->
-<table
- style="border-width: 0px; width: 800px; background: #ffffff;"
- cellspacing="0" cellpadding="0">
-<tr>
-<td valign="top">
- <table width="801" border="0" cellspacing="1" cellpadding="0" bgcolor="#ffffff">
- <tr>
- <td class="leftmenu">
- <a href="http://foam.sourceforge.net/doc/Doxygen/html"
- class="menuLefton">Source Guide</a>
- </td>
- <td class="topmenu">
- <a href="http://www.openfoam.com/about/"
- class="menuTopoff">OpenCFD</a>
- </td>
- <td class="topmenu">
- <a href="http://www.openfoam.com/features/"
- class="menuTopoff">Features</a>
- </td>
- <td class="topmenu">
- <a href="http://www.openfoam.com/contact/"
- class="menuTopoff">Contact</a>
- </td>
- <td class="topmenu">
- <a href="http://www.openfoam.com/"
- class="menuTopoff">OpenFOAM</a>
- </td>
- </tr>
- <tr><td></td></tr>
- </table>
-</td>
-</tr>
-</table>
-<table
- style="border-width: 0px; width: 800px; background: #ffffff;"
- cellspacing="5" cellpadding="0">
-<tr>
-<td>
diff --git a/doc/doxygen/OpenFOAMdocIcon.png b/doc/Doxygen/OpenFOAMdocIcon.png
similarity index 100%
rename from doc/doxygen/OpenFOAMdocIcon.png
rename to doc/Doxygen/OpenFOAMdocIcon.png
diff --git a/doc/Doxygen/OpenFOAMicon.png b/doc/Doxygen/OpenFOAMicon.png
index 073c65b684d0ddaa64412ce6637f8e5776bbb2a9..568b0060908a05c84cc9e9a707e65ddd43949d2b 100644
Binary files a/doc/Doxygen/OpenFOAMicon.png and b/doc/Doxygen/OpenFOAMicon.png differ
diff --git a/doc/Doxygen/OpenFOAMlogo.jpg b/doc/Doxygen/OpenFOAMlogo.jpg
deleted file mode 100644
index f16a0683da8681c1d9891c2b19c44e56ac2869f8..0000000000000000000000000000000000000000
Binary files a/doc/Doxygen/OpenFOAMlogo.jpg and /dev/null differ
diff --git a/doc/Doxygen/OpenSourceToolbox.jpg b/doc/Doxygen/OpenSourceToolbox.jpg
deleted file mode 100644
index 733025ba5959fb2905f7c3d0525cb994f7ce514b..0000000000000000000000000000000000000000
Binary files a/doc/Doxygen/OpenSourceToolbox.jpg and /dev/null differ
diff --git a/doc/Doxygen/OpenSourceToolkit.jpg b/doc/Doxygen/OpenSourceToolkit.jpg
deleted file mode 100644
index fc943f8c32fea11123a58731f4e17f047fff7229..0000000000000000000000000000000000000000
Binary files a/doc/Doxygen/OpenSourceToolkit.jpg and /dev/null differ
diff --git a/doc/doxygen/_Footer b/doc/Doxygen/_Footer
similarity index 61%
rename from doc/doxygen/_Footer
rename to doc/Doxygen/_Footer
index f68739e80373b5855fc475fa1e73755b24bc1e35..b6622df85b26cec648b97cee3a5753c4b6b50502 100644
--- a/doc/doxygen/_Footer
+++ b/doc/Doxygen/_Footer
@@ -4,12 +4,17 @@
<p>
Copyright © 2004-2011
<a href="http://www.openfoam.com/about">OpenCFD Limited</a>
- | OPENFOAM® and OpenCFD® are registered trademarks of OpenCFD Ltd.
+ |
+ OPENFOAM® and OpenCFD® are registered
+ <a href="http://www.openfoam.com/legal/trademark-policy.php">trademarks
+ </a> of OpenCFD Ltd.
</p>
<p class="credits">
Based on design by
<a target="new" href="http://1234.info">1234.info</a>
- | Content generated by <a target="new" href="http://www.doxygen.org">doxygen</a>
+ |
+ Content generated by
+ <a target="new" href="http://www.doxygen.org">doxygen</a>
</p>
</div> <!-- footer -->
</div> <!-- page-container -->
diff --git a/doc/doxygen/_Header b/doc/Doxygen/_Header
similarity index 55%
rename from doc/doxygen/_Header
rename to doc/Doxygen/_Header
index e788da5f0dd21bb5a2ad810eca6d9f3e731200fd..f08179b6f8fdec10a625460fce457cea05f21fac 100644
--- a/doc/doxygen/_Header
+++ b/doc/Doxygen/_Header
@@ -24,47 +24,18 @@
<div class="page-container">
<div class="header">
<div class="header-top">
- <div class="round-border-topleft"></div>
- <div class="round-border-topright"></div>
- <a class="sitelogo" href="http://www.openfoam.com" title="Home"></a>
+ <a class="sitelogo" href="http://www.openfoam.com" title="Home">
+ <img class=left src="../css/img/OpenFOAMlogo.png">
+ </a>
<div class="sitename">
- <h1><a
- href="http://foam.sourceforge.net/doc/Doxygen/html/"
- title="Source Guide">Programmer's C++ documentation</a></h1>
+ <h1>
+ <a href="http://foam.sourceforge.net/doc/Doxygen/html/"
+ title="Source Guide">OpenFOAM C++ Documentation
+ </a>
+ </h1>
+ <img class=right src="../css/img/OpenCFDlogo.png">
</div>
</div> <!-- header-top -->
- <div class="header-bottom">
- <!-- navigation -->
- <div class="nav2">
- <ul>
- <li>
- <a href="http://foam.sourceforge.net/doc/Doxygen/html">Source Guide</a>
- </li>
- </ul>
- <ul>
- <li>
- <a href="http://www.openfoam.com/features/">Features</a>
- </li>
- </ul>
- <ul>
- <li>
- <a href="http://www.openfoam.com/">OpenFOAM</a>
- </li>
- </ul>
- <ul>
- <li>
- <a href="http://www.openfoam.com/contact/">Contact</a>
- </li>
- </ul>
- <ul>
- <li>
- <a href="http://www.openfoam.com/about/">OpenCFD</a>
- </li>
- </ul>
- </ul>
-
- </div> <!-- nav2 -->
- </div> <!-- header-bottom -->
</div> <!-- header -->
<div class="main">
diff --git a/doc/doxygen/css/cfdLayout.css b/doc/Doxygen/css/cfdLayout.css
similarity index 91%
rename from doc/doxygen/css/cfdLayout.css
rename to doc/Doxygen/css/cfdLayout.css
index 4376035c4ca9bc13702343c0761e4831109b7a27..666b82f355fd6da5df9c645081b354161fd6396f 100644
--- a/doc/doxygen/css/cfdLayout.css
+++ b/doc/Doxygen/css/cfdLayout.css
@@ -29,8 +29,9 @@ p:after {
}
/* page-container **************************************/
+
.page-container {
- width:960px;
+ width:100%;
margin:0px auto;
margin-top:10px;
margin-bottom:10px;
@@ -75,49 +76,31 @@ p:after {
overflow:hidden /*IE6*/;
}
+.left {margin:none; border:none; }
+.right {margin:none; border:none; position:absolute; right:35px;top:32px}
+
.header-bottom {
border:3px solid rgb(175,175,175);
border-top-width: 1px;
background:rgb(225,225,225);
}
-.header .round-border-topleft {
- width:25px;
- height:25px;
- position:absolute;
- z-index:100;
- background:url(img/bg_head_corner_topleft_25px.gif) no-repeat;
- margin-top:-3px;
- margin-left:-3px;
-}
-
-.header .round-border-topright {
- width:25px;
- height:25px;
- position:absolute;
- z-index:100;
- background:url(img/bg_head_corner_topright_25px.gif) no-repeat;
- margin-top:-3px;
- margin-left:932px;
-}
-
/********************sitelogo *************************************************/
.sitelogo {
- width:924px;
+ width:100%;
height:40px;
position:absolute;
z-index:1;
margin:20px 0 0 15px;
- background:url(img/OpenCFDlogo.png) no-repeat;
+/* background:url(img/OpenCFDlogo.png) no-repeat;*/
}
/**************************sitename ************************************************/
.sitename {
width:400px;
height:45px;
- position:absolute;
- z-index:1;
- margin:25px 0 0 320px;
+ margin:auto;
+ margin-top:25px;
overflow:visible !important /*Firefox*/;
overflow:hidden /*IE6*/;
}
@@ -149,7 +132,7 @@ p:after {
width:100%;
padding:1.0em 0 1.5em 0;
border-left:3px solid rgb(175,175,175);
- border-right:3px solid rgb(175,175,175);
+ border-right:0px solid rgb(175,175,175);
}
.header-breadcrumbs ul {
@@ -257,7 +240,7 @@ p:after {
/*******************main **********************************************/
.main {
clear:both;
- width:954px;
+ width:100% minus 2px;
padding-bottom:30px;
border-left: 3px solid rgb(175,175,175);
border-right:3px solid rgb(175,175,175);
diff --git a/doc/doxygen/css/cfdNav.css b/doc/Doxygen/css/cfdNav.css
similarity index 100%
rename from doc/doxygen/css/cfdNav.css
rename to doc/Doxygen/css/cfdNav.css
diff --git a/doc/doxygen/css/doxyMod.css b/doc/Doxygen/css/doxyMod.css
similarity index 90%
rename from doc/doxygen/css/doxyMod.css
rename to doc/Doxygen/css/doxyMod.css
index 01d666e03e7443e8e25f4a7c514f2329309fcbe4..92d47ded75f42f3314f0bd3f69aa9fb68265d30f 100644
--- a/doc/doxygen/css/doxyMod.css
+++ b/doc/Doxygen/css/doxyMod.css
@@ -52,3 +52,12 @@ tr.memlist
background-color: #F0F0F0;
}
+
+#searchli {
+ padding: 0px;
+}
+
+#MSearchBox {
+ margin-top: 0px;
+ width: 200px;
+}
diff --git a/doc/doxygen/css/doxyTabs.css b/doc/Doxygen/css/doxyTabs.css
similarity index 100%
rename from doc/doxygen/css/doxyTabs.css
rename to doc/Doxygen/css/doxyTabs.css
diff --git a/doc/doxygen/css/doxygen.css b/doc/Doxygen/css/doxygen.css
similarity index 100%
rename from doc/doxygen/css/doxygen.css
rename to doc/Doxygen/css/doxygen.css
diff --git a/doc/Doxygen/css/img/OpenCFDlogo.png b/doc/Doxygen/css/img/OpenCFDlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a70967247343d60af4b5d99af60652c650cadf85
Binary files /dev/null and b/doc/Doxygen/css/img/OpenCFDlogo.png differ
diff --git a/doc/Doxygen/css/img/OpenFOAMlogo.png b/doc/Doxygen/css/img/OpenFOAMlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..aae8387f5ea2b443ea550f52e8bab62c4f19883e
Binary files /dev/null and b/doc/Doxygen/css/img/OpenFOAMlogo.png differ
diff --git a/doc/doxygen/css/img/bg_bullet_full_1.gif b/doc/Doxygen/css/img/bg_bullet_full_1.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_bullet_full_1.gif
rename to doc/Doxygen/css/img/bg_bullet_full_1.gif
diff --git a/doc/doxygen/css/img/bg_bullet_full_2.gif b/doc/Doxygen/css/img/bg_bullet_full_2.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_bullet_full_2.gif
rename to doc/Doxygen/css/img/bg_bullet_full_2.gif
diff --git a/doc/doxygen/css/img/bg_bullet_half_1.gif b/doc/Doxygen/css/img/bg_bullet_half_1.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_bullet_half_1.gif
rename to doc/Doxygen/css/img/bg_bullet_half_1.gif
diff --git a/doc/doxygen/css/img/bg_bullet_half_2.gif b/doc/Doxygen/css/img/bg_bullet_half_2.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_bullet_half_2.gif
rename to doc/Doxygen/css/img/bg_bullet_half_2.gif
diff --git a/doc/doxygen/css/img/bg_corner_topright.gif b/doc/Doxygen/css/img/bg_corner_topright.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_corner_topright.gif
rename to doc/Doxygen/css/img/bg_corner_topright.gif
diff --git a/doc/doxygen/css/img/bg_head_corner_topleft_25px.gif b/doc/Doxygen/css/img/bg_head_corner_topleft_25px.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_head_corner_topleft_25px.gif
rename to doc/Doxygen/css/img/bg_head_corner_topleft_25px.gif
diff --git a/doc/doxygen/css/img/bg_head_corner_topright_25px.gif b/doc/Doxygen/css/img/bg_head_corner_topright_25px.gif
similarity index 100%
rename from doc/doxygen/css/img/bg_head_corner_topright_25px.gif
rename to doc/Doxygen/css/img/bg_head_corner_topright_25px.gif
diff --git a/doc/doxygen/css/openfoam.css b/doc/Doxygen/css/openfoam.css
similarity index 100%
rename from doc/doxygen/css/openfoam.css
rename to doc/Doxygen/css/openfoam.css
diff --git a/doc/Doxygen/tabs.css b/doc/Doxygen/tabs.css
deleted file mode 100644
index 3c567bb529ae14a213c6c4c9c3fee54ef6c7bbf8..0000000000000000000000000000000000000000
--- a/doc/Doxygen/tabs.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-div.tabs
-{
- float : left;
- width : 100%;
- margin-bottom : 2px;
- padding-bottom : 6px;
-}
-
-div.tabs ul
-{
- margin : 0px;
- padding-left : 0px;
- border-right : 1px solid #84B0C7;
- list-style : none;
-}
-
-div.tabs li, div.tabs form
-{
- display : inline;
- margin : 0px;
- padding : 0px;
-}
-
-div.tabs form
-{
- float : left;
- padding : 0px 9px;
-}
-
-div.tabs a
-{
- float : left;
- font-size : 12px;
- font-weight : bold;
- text-decoration : none;
- border-right : 1px solid #000000;
-}
-
-div.tabs a:hover
-{
- background-position: 100% -150px;
-}
-
-div.tabs a:link, div.tabs a:visited, div.tabs a:active, div.tabs a:hover
-{
- color : #000000;
-}
-
-div.tabs span
-{
- float : left;
- display : block;
- padding : 0px 9px;
- white-space : nowrap;
-}
-
-div.tabs input
-{
- float : right;
- display : inline;
- font-size : 12px;
-}
-
-div.tabs td
-{
- font-size : 12px;
- font-weight : bold;
- text-decoration : none;
-}
-
-/* Commented backslash hack hides rule from IE5-Mac \*/
-div.tabs span { float : none; }
-/* End IE5-Mac hack */
-
-div.tabs a:hover span
-{
- background-position: 0% -150px;
-}
-
-div.tabs li#current a
-{
- border-width : 0px;
- border-right : 1px solid #000000;
- color : #0000ff;
-}
-
-div.tabs li#current span
-{
- padding-bottom : 0px;
-}
-
-div.nav
-{
- background : none;
- border : none;
- border-bottom : 1px solid #000000;
-}
-
diff --git a/doc/changes/TODO b/doc/changes/TODO
deleted file mode 100644
index 01a120bb9efb032777b36d4deea33358246296be..0000000000000000000000000000000000000000
--- a/doc/changes/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-- check
- new fvMesh
- new fvMeshSubset
-for consistency with createMesh.H
-
-- Check the following:
-
-doc/changes/inotify.txt
diff --git a/doc/changes/dynamicCode.org b/doc/changes/dynamicCode.org
deleted file mode 100644
index a6d9dbbe8e11bcff5146d742033c4c90a47978d7..0000000000000000000000000000000000000000
--- a/doc/changes/dynamicCode.org
+++ /dev/null
@@ -1,243 +0,0 @@
-# -*- mode: org; -*-
-#
-#+TITLE: =dynamicCode=: Dynamic code compilation
-#+AUTHOR: OpenCFD Ltd.
-#+DATE: TBA
-#+LINK: http://www.openfoam.com
-#+OPTIONS: author:nil ^:{}
-# Copyright (c) 2011 OpenCFD Ltd.
-
-* Dictionary preprocessing directive: =#codeStream=
- This is a dictionary preprocessing directive (=functionEntry=) which
- provides a snippet of OpenFOAM C++ code which gets compiled and executed to
- provide the actual dictionary entry. The snippet gets provided as three
- sections of C++ code which just gets inserted into a template:
- - =code= section: the actual body of the code. It gets called with arguments
- =OStream& os, const dictionary& dict= and the C++ code can do a
- =dict.lookup= to find current dictionary values.
- - optional =codeInclude= section: any #include statements to include OpenFOAM
- files.
- - optional =codeOptions= section: any extra compilation flags to be added to
- =EXE_INC= in =Make/options=. These usually are =-I= include directory
- options.
- - optional =codeLibs= section: any extra compilation flags to be added to
- =LIB_LIBS= in =Make/options=.
-
- To ease inputting mulit-line code there is the =#{ #}= syntax. Anything in
- between these two delimiters becomes a string with all newlines, quotes etc
- preserved.
-
- Example: Look up dictionary entries and do some calculation
- #+BEGIN_SRC c++
-
- startTime 0;
- endTime 100;
- ..
- writeInterval #codeStream
- {
- code
- #{
- scalar start = readScalar(dict["startTime"]);
- scalar end = readScalar(dict["endTime"]);
- label nDumps = 5;
- os << ((end-start)/nDumps);
- #};
- };
- #+END_SRC
-
-* Implementation
- - the =#codeStream= entry reads the dictionary following it, extracts the
- =code=, =codeInclude=, =codeOptions=, =codeLibs= sections (these are just strings) and
- calculates the SHA1 checksum of the contents.
- - it copies a template file
- =(etc/codeTemplates/dynamicCode/codeStreamTemplate.C)= or
- =($FOAM_CODE_TEMPLATES/codeStreamTemplate.C)=, substituting all
- occurences of =code=, =codeInclude=, =codeOptions=, =codeLibs=.
- - it writes library source files to =dynamicCode/<SHA1>= and compiles
- it using =wmake libso=.
- - the resulting library is generated under
- =dynamicCode/platforms/$WM_OPTIONS/lib= and is loaded (=dlopen=, =dlsym=)
- and the function executed.
- - the function will have written its output into the Ostream which then gets
- used to construct the entry to replace the whole =#codeStream= section.
- - using the SHA1 means that same code will only be compiled and loaded once.
-
-* Boundary condition: =codedFixedValue=
- This uses the same framework as codeStream to have an in-line specialised
- =fixedValueFvPatchField=.
- #+BEGIN_SRC c++
- outlet
- {
- type codedFixedValue;
- value uniform 0;
- redirectType ramp;
-
- code
- #{
- operator==(min(10, 0.1*this->db().time().value()));
- #};
- }
- #+END_SRC
- It by default always includes =fvCFD.H= and adds the =finiteVolume= library to
- the include search path and the linked libraries. Any other libraries will
- need
- to be added using the =codeInclude=, =codeLibs=, =codeOptions= section or provided through
- the =libs= entry in the =system/controlDict=.
-
- A special form is where the code is not supplied in-line but instead comes
- from the =codeDict= dictionary in the =system= directory. It should contain
- a =ramp= entry:
- #+BEGIN_SRC c++
- ramp
- {
- code
- #{
- operator==(min(10, 0.1*this->db().time().value()));
- #};
- }
- #+END_SRC
- The advantage of using this indirect way is that it supports
- =runTimeModifiable= so any change of the code will be picked up next iteration.
-
-* Function object: =coded=
- This uses the same framework as codeStream to have an in-line specialised
- =functionObject=.
- #+BEGIN_SRC c++
- functions
- {
- pAverage
- {
- functionObjectLibs ("libutilityFunctionObjects.so");
- type coded;
- redirectType average;
- outputControl outputTime;
- code
- #{
- const volScalarField& p = mesh().lookupObject<volScalarField>("p");
- Info<<"p avg:" << average(p) << endl;
- #};
- }
- }
- #+END_SRC
- This dynamic code framework uses the following entries
- + =codeData=: declaration (in .H file) of local (null-constructable) data
- + =codeInclude=: (.C file) usual include section
- + =codeRead=: (.C file) executed upon dictionary read
- + =codeExecute=: (.C file) executed upon functionObject execute
- + =codeEnd=: (.C file) executed upon functionObject end
- + =code=: (.C file) executed upon functionObject write. This is the usual place
- for simple functionObject.
- + =codeLibs=, =codeOptions=: usual
-
- =coded= by default always includes =fvCFD.H= and adds the =finiteVolume= library to
- the include search path and the linked libraries. Any other libraries will
- need to be added explicitly (see =codeInclude=, =codeLibs=, =codeOptions= sections) or provided through
- the =libs= entry in the =system/controlDict=.
-
- =coded= is an =OutputFilter= type =functionObject= so supports the usual
- + =region=: non-default region
- + =enabled=: enable/disable
- + =outputControl=: =timeStep= or =outputTime=
- + =outputInterval=: in case of =timeStep=
- entries.
-
-* Security
- Allowing the case to execute C++ code does introduce security risks. A
- third-party case might have a =#codeStream{#code system("rm -rf .");};= hidden
- somewhere in a dictionary. =#codeStream= is therefore not enabled by default
- you have to enable it by setting in the system-wide =controlDict=
- #+BEGIN_SRC c++
- InfoSwitches
- {
- // Allow case-supplied c++ code (#codeStream, codedFixedValue)
- allowSystemOperations 1;
- }
- #+END_SRC
-
-* Field manipulation
- Fields are read in as =IOdictionary= so can be upcast to provide access to the
- mesh:
- #+BEGIN_SRC c++
- internalField #codeStream
- {
- codeInclude
- #{
- #include "fvCFD.H"
- #};
-
- code
- #{
- const IOdictionary& d = dynamicCast<const IOdictionary>(dict);
- const fvMesh& mesh = refCast<const fvMesh>(d.db());
- scalarField fld(mesh.nCells(), 12.34);
- fld.writeEntry("", os);
- #};
-
- codeOptions
- #{
- -I$(LIB_SRC)/finiteVolume/lnInclude
- #};
-
- codeLibs
- #{
- -lfiniteVolume
- #};
- };
- #+END_SRC
-
- Note: above field initialisation has the problem that the boundary conditions
- are not evaluated so e.g. processor boundaries will not hold the opposite cell
- value.
-
-* Pitfalls
- The syntax of =#codeStream= can be quite hard to get right. These are some
- common pitfalls:
- + the =code= string has to be a valid set of C++ expressions so has to end in
- a ';'
- + the C++ code upon execution has to print a valid dictionary entry. In above example it
- prints 'uniform 12.34;'. Note the ';' at the end. It is advised to use the
- =writeEntry= as above to handle this and also e.g. binary streams (=codeStream=
- inherits the stream type from the dictionary)
- + the =code=, =codeInclude=, =codeOptions=, =codeLibs= entries are just like any other
- dictionary string entry so there has to be a ';' after the string
- + the =#codeStream= entry (itself a dictionary) has to end in a ';'
-
-* Exceptions
- There are unfortunately some exceptions to above field massaging.
- Following applications read
- the field as a dictionary, not as an =IOdictionary=:
- - =foamFormatConvert=
- - =changeDictionary=
- - =foamUpgradeCyclics=
- These applications will usually switch off all '#' processing which
- just preserves the entries as strings (including all
- formatting). =changeDictionary= has the =-enableFunctionEntries= option for if
- one does want to evaluate any preprocessing in the changeDictionaryDict.
-
-* Other
- - paraFoam: paraview currently does not export symbols on loaded libraries
- (more specific : it does not add 'RTLD_GLOBAL' to the dlopen flags) so
- one will have to add the used additional libraries (libfiniteVolume,
- lib..) either to the =codeLibs= linkage section (preferred) or to the 'libs' entry in system/controlDict to prevent getting
- an error of the form
-
- --> FOAM FATAL IO ERROR:
- Failed loading library "libcodeStream_3cd388ceb070a2f8b0ae61782adbc21c5687ce6f.so"
-
- By default =#codeStream= links in =libOpenFOAM= and =codedFixedValue= and =coded=
- functionObject link in both =libOpenFOAM= and =libfiniteVolume=.
-
- - parallel running not tested a lot. What about distributed data
- (i.e. non-=NFS=) parallel?
-
- - codedFixedValue could be extended to provide local data however
- in terms of complexity this is not really worthwhile.
-
- - all templates come from (in order of preference)
- =FOAM_TEMPLATE_DIR=
- =~/.OpenFOAM/dev/codeTemplates/dynamicCode=
- =etc/codeTemplates/dynamicCode=
-
- - any generated C++ code will display line numbers relative to the original
- dictionary (using the '#line' directive) to ease finding compilation
- errors.
diff --git a/doc/changes/inotify.txt b/doc/changes/inotify.txt
deleted file mode 100644
index 74e2fc7bb4adb50e007fd659817fbdeddae76661..0000000000000000000000000000000000000000
--- a/doc/changes/inotify.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-http://www.openfoam.com
-Copyright (c) 2011 OpenCFD Ltd.
-
-Cleanup of automatic regIOobject rereading.
-
-- all files (usually only IOdictionary) that need to be monitored
-should be registered using MUST_READ_IF_MODIFIED. The MUST_READ should
-be used for objects that do not need to be re-read (e.g. fields).
-In the old system it would actually monitor e.g. 0/U and constant/polyMesh
-files.
-I've temporarily added a warning in IOdictionary if constructed with MUST_READ.
-Same for IOList,IOField,IOMap if constructed with MUST_READ_IF_MODIFIED
-(or is rereading supported?). Please let me know if something does not work or
-you see the warning
- "Dictionary constructed with IOobject::MUST_READ instead of IOobject::MUST_READ_IF_MODIFIED." << nl
-
-
-- any monitored and modified file will get reloaded from the exact path
-that was monitored. In the old system it would/could do a re-search through all
-times.
-
-
-- all reductions to synchronise status on different processors are done with
-a single reduction instead of one reduction per registered object. This could
-be quite a gain on large numbers of processors.
-
-
-- all file monitoring is done by an instance of 'fileMonitor' in the Time
-class. The fileMonitor class can be found in OSspecific. It uses either
-timestamps as before or the (linux-specific) 'inotify' system framework
-(available only if compiled with -DFOAM_USE_INOTIFY).
-
-
-- the monitoring can be done in one of four modes as set by
- OptimisationSwitches::fileModificationChecking
-
- - timeStamp : old behaviour : all nodes check the timestamp
- - inotify : using inotify instead of timestamps
- - timeStampMaster,inotifyMaster : only the master node checks the file
- and only the master node reads it and distribute it to the
- slaves. This makes runTimeModifiable possible on distributed
- running (see below).
-
-- distributed running:
- - set fileModificationChecking to e.g. timeStampMaster
- - decompose a case, e.g. cavity
- - copy system and constant to processor0/
- - put the all the processor* directories on the wanted nodes inside
- the case directory. E.g.
- - on master have /tmp/cavity/processor0
- - on slaveN have /tmp/cavity/processorN
- - so to reiterate:
- - there is no need for cavity/constant or cavity/system, all the
- dictionaries are only in processor0/constant or processor0/system
- - the slave processor directories have no system directory and the
- constant directory only contains the mesh.
- - start the job in distributed mode by specifying the slave roots
- (so one fewer than the number of processors) with
- the -roots command-line option:
-
- mpirun -np 4 icoFoam -roots '("/tmp" "/tmp" "/tmp")' -parallel
-
- - the alternative to the -roots option is to have a
- cavity/system/decomposeParDict on the master with
- distributed yes;
- roots ("/tmp" "/tmp" "/tmp");
-
- - as a convenience for cases when the slave roots are identical,
- a single root entry is interpreted as being the same for all slaves.
- With the -roots command-line option, this can take one of two forms:
-
- mpirun -np 4 icoFoam -roots '("/tmp")' -parallel
-
- or simply
-
- mpirun -np 4 icoFoam -roots '"/tmp"' -parallel
-
-
-Details:
-- timeStampMaster, inotifyMaster : this works only for IOdictionaries that
-are READ_IF_MODIFIED. It means that slaves read exactly the same dictionary
-as the master so cannot be used for dictionaries that contain e.g. mesh
-specific information.
-
-- note: even if the file does not exist (e.g. when timeStampMaster) it
-will still register a local file with the fileMonitor. This is so fileMonitor
-stays synchronised. So take care when reading/creating non-parallel dictionary.
-
-- inotify is a monitoring framework used to monitor changes in
-lots of files (e.g. used in desktop search engines like beagle). You specify
-files to monitor and then get warned for any changes to these files.
-It does not need timestamps. There is no need for fileModificationSkew
-to allow for time differences. (there can still temporarily be a difference
-in modified status between different processors due to nfs lagging). The big
-problem is that it does not work over nfs3 (not sure about nfs4).
-
-- fileMonitor stores two hashtables per file so there is a small overhead
-adding and removing files from monitoring.
-
-- if runTimeModifiable is false at start of run no files will get monitored,
-however if runTimeModified gets set to false during the run the files
-will still get monitored (though never reloaded). This is only a hypothetical
-problem in that the kernel still stores events for the monitored files. However
-inotify is very efficient - e.g. it gets used to track changes on file systems
-for desktop search engines.
-
-- in the old system one could call modified() on any object and get
-and uptodate state. In the new system it will return the state from
-the last runTime++ (which if it triggered any re-reads will have reset the
-state anyway).
diff --git a/doc/changes/pointAndEdgeSync.txt b/doc/changes/pointAndEdgeSync.txt
deleted file mode 100644
index 7dd385acce1fc426c6513cc8b9a092338e47bd2a..0000000000000000000000000000000000000000
--- a/doc/changes/pointAndEdgeSync.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-http://www.openfoam.com
-Copyright (c) 2011 OpenCFD Ltd.
-
-Some background on the new structure to synchronise point and edge data. The
-building blocks:
-- globalIndex : globally consecutive numbering of (untransformed) data. It
-consists of a single label which starts at 0 on processor 0 and is numbered
-consecutively on consecutive processors. The globalIndex class contains
-functions to convert to/from processor and local index.
-
-- globalIndexAndTransform : all the transformations in a mesh. Because the
-transformations (cyclics, processorCyclics) need to fill space there can
-be only three independent transforms. This class contains functions to encode
-local index,processor and transformation into a labelPair.
-
-- mapDistribute : contains constructors from local and remote data and
-works out a compact storage scheme and returns corresponding indices into
-the local storage and calculates a scheduling to get the local and remote
-data into the local storage. The wanted data is
- - untransformed: labelList(List) in globalIndex numbering
- - transformed: labelPairList(List) in globalIndexAndTransform
-See also mapDistribute.H
-
-- globalMeshData : works out and stores a mapDistribute to get hold
-of coupled point or edge data:
- - globalPointSlavesMap() : the map to get all coupled point data
- into a compact form
- - globalPointSlaves : per point (on the patch of coupled faces) the
- indices into the compact data corresponding to untransformed connected
- points
- - globalPointTransformedSlaves : same but for transformed connected
- points
-See e.g. syncPointData which applies a reduction operator to data on
-coupled points. Note that it needs to know whether the data is a position
-(since might need separation() vector).
-
-These structures get used in e.g.
-- syncTools : general synchronisation on points,edges, faces. The point and
-edge synchronisation are thin wrappers around the globalMeshData functionality.
-- volPointInterpolation : uses a mix of globalMeshData (for synchronising
-collocated points) and patch-wise (for separated points).
diff --git a/doc/changes/splitCyclic.txt b/doc/changes/splitCyclic.txt
deleted file mode 100644
index 99f42b3194914eb41555ae7cd8830a1394ffad02..0000000000000000000000000000000000000000
--- a/doc/changes/splitCyclic.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-http://www.openfoam.com
-Copyright (c) 2011 OpenCFD Ltd.
-
-Short overview of the changes to have cyclics split into two halves.
-
-Cyclics
--------
-The two cyclic halves are now split like processor patches. There should be no
-difference in running.
-
-Advantages:
-- decomposed cyclics can now be handled properly. It just needs to preserve
-the cyclic patch it originates from.
-- We can now construct a table of global transformations and handle
-points/edges/cells with transformations.
-- face ordering after topological changes becomes much easier since we
-now preserve what half the face comes from.
-- cyclic handling becomes more consistent with processor handling and can
-quite often be handled in the same condition.
-- transformation tensors now become single entry.
-
-The disadvantages:
-- a patch-wise loop now might need to store data to go to the neighbour half
-since it is no longer handled in a single patch.
-- decomposed cyclics now require overlapping communications so will
-only work in 'nonBlocking' mode or 'blocking' (=buffered) mode but not
-in 'scheduled' mode. The underlying message passing library
-will require overlapping communications with message tags.
-- it is quite a code-change and there might be some oversights.
-- once converted (see foamUpgradeCyclics below) cases are not backwards
-compatible with previous versions.
-
-
-blockMesh
----------
-blockMeshDict now allows patch definition using the construct-from-dictionary
-constructor. This helps defining patches that require additional input e.g.
-directMapped and now cyclic:
-
-boundary
-(
- sides2_half0
- {
- type cyclic;
- neighbourPatch sides2_half1;
- faces ((2 4 5 3));
- }
-
-The syntax is - like the polyMesh/boundary file - a list of dictionaries with
-one additional entry 'faces' for the block faces. Above shows the new
-required entry 'neighbourPatch' for cyclic.
-
-blockMesh still reads the old format. For a cyclic it will automatically
-introduce two patches for the halves, with names xxx_half0 and xxx_half1.
-
-
-foamUpgradeCyclics
-------------------
-This is a tool which reads the polyMesh/boundary file and any vol/surface/point
-fields and converts them.
-It will check if anything needs to be converted, backup the current file to .old
-and split any cyclic patchFields into two entries.
-
-
-Mesh converters
----------------
-Most mesh formats use cyclics in a single patch (i.e. the old way).
-The converters have been adapted to use the patch 'oldCyclic' instead of
-'cyclic'. oldCyclic uses the 17x automatic ordering but writes 'type cyclic'
-so afterwards foamUpgradeCyclics can be run to upgrade.
-
-
-decomposePar
-------------
-Decomposes cyclics into processorCyclic:
-
- procBoundary0to1throughsides1_half0
- {
- type processorCyclic;
- nFaces 1000;
- startFace 91350;
- myProcNo 0;
- neighbProcNo 1;
- referPatch sides1_half0;
- }
-
-They have an additional 'referPatch' entry which gives the (cyclic) patch
-to use for any transformation.
-
-
-Details
--------
-- the cyclic patch dictionary has an entry neighbourPatch. The
-patch has new member functions:
-
- //- Get neighbouring patchID
- label neighbPatchID() const
-
- //- Get neighbouring patch
- const cyclicPolyPatch& neighbPatch()
-
- //- Am I the owner half
- bool owner()
-
-The cyclic still has forward() and reverse() transformations (with
-the reverse() equal to the neighbPatch().forward()).
-
-There is no transformLocalFace anymore - the ordering is the same for
-both halves.
-
-
-- 'pure' processor patches now are always coincident - they (should) have no
-transformation. As said above cyclics are decomposed into a derived
-type 'processorCyclic'.
-
-
-- processor patches use overlapping communication using a different message
-tag. This maps straight through into the MPI message tag. Each processor
-'interface' (processorPolyPatch, processorFvPatch, etc.) has a 'tag()'
-to use for communication.
-
-
-- when constructing a GeometricField from a dictionary it will explicitly
-check for non-existing entries for cyclic patches and exit with an error message
-warning to run foamUpgradeCyclics. (1.7.x will check if you are trying
-to run a case which has split cyclics)
-
-
diff --git a/doc/changes/staticLinkage.txt b/doc/changes/staticLinkage.txt
deleted file mode 100644
index 916a5107ed00ac248a90b6c67b20261e13ab0f97..0000000000000000000000000000000000000000
--- a/doc/changes/staticLinkage.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-http://www.openfoam.com
-Copyright (c) 2011 OpenCFD Ltd.
-
-Static linkage:
-
-- compile libraries as static objects:
- src; ./Allwmake libo
-- in the desired application (e.g. interFoam) adapt Make/options
- to link all indirect and direct dependencies as .o files:
-
- sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
- sinclude $(RULES)/mplib$(WM_MPLIB)
-
- EXE_LIBS = \
- -lz $(PLIBS) \
- $(FOAM_LIBBIN)/$(FOAM_MPI)/libPstream.o \
- $(FOAM_LIBBIN)/libOSspecific.o \
- $(FOAM_LIBBIN)/libtwoPhaseInterfaceProperties.o \
- $(FOAM_LIBBIN)/libinterfaceProperties.o \
- $(FOAM_LIBBIN)/libincompressibleTransportModels.o \
- $(FOAM_LIBBIN)/libincompressibleTurbulenceModel.o \
- $(FOAM_LIBBIN)/libincompressibleRASModels.o \
- $(FOAM_LIBBIN)/libincompressibleLESModels.o \
- $(FOAM_LIBBIN)/libLESdeltas.o \
- $(FOAM_LIBBIN)/libLESfilters.o \
- $(FOAM_LIBBIN)/libfiniteVolume.o \
- $(FOAM_LIBBIN)/libmeshTools.o \
- $(FOAM_LIBBIN)/libtriSurface.o \
- $(FOAM_LIBBIN)/libfileFormats.o \
- $(FOAM_LIBBIN)/libOpenFOAM.o \
-
-- in Make/files add
- SEXE = $(FOAM_USER_APPBIN)/interFoam-static
-- wmake exe
-- check with ldd
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 5dbc9344224f86c3ddc5c30ebf10f3052023de32..6b7f61f710312d64dc4e4f094a131ee414ea761a 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -3,7 +3,7 @@
#+TITLE: OpenFOAM C++ style guide
#+AUTHOR: OpenCFD Ltd.
#+DATE: Feb 2011
-#+LINK: http://www.opencfd.co.uk
+#+LINK: http://www.OpenFOAM.com
#+OPTIONS: author:nil ^:{}
#+STARTUP: hidestars
#+STARTUP: odd
diff --git a/doc/doxygen/Allwmake b/doc/doxygen/Allwmake
deleted file mode 100755
index fbc20d93fd054d2fa63b80606e6f0e36924c027e..0000000000000000000000000000000000000000
--- a/doc/doxygen/Allwmake
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
-[ -d "$WM_PROJECT_DIR" ] || {
- echo "Error: WM_PROJECT_DIR directory does not exist"
- echo " Check the OpenFOAM entries in your dot-files and source them."
- echo " WM_PROJECT_DIR=$WM_PROJECT_DIR"
- exit 1
-}
-
-set -x
-
-rm -rf latex man
-
-# remove html directory in background
-mv html html-stagedRemove$$ 2> /dev/null
-rm -rf html-stagedRemove$$ >/dev/null 2>&1 &
-
-# ensure that created files are readable by everyone
-umask 22
-doxygen
-
-# fix permissions (NB: '+X' and not '+x'!)
-chmod -R a+rX html latex man 2>/dev/null
-
-echo
-echo "Done doxygen"
-echo
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
deleted file mode 100644
index 35d29e2ce716cfaafdf0ff3c443d6224cae87264..0000000000000000000000000000000000000000
--- a/doc/doxygen/Doxyfile
+++ /dev/null
@@ -1,1589 +0,0 @@
-# Doxyfile 1.6.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = OpenFOAM-$(WM_PROJECT_VERSION)
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH = $(WM_PROJECT_DIR)
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen to replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO (the default) the constructors will
-# appear in the respective orders defined by SORT_MEMBER_DOCS and
-# SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is
-# set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text "
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = $(WM_PROJECT_DIR)/src \
- $(WM_PROJECT_DIR)/applications/utilities \
- $(WM_PROJECT_DIR)/applications/solvers
-
-# limit input for testing purposes
-# INPUT = $(WM_PROJECT_DIR)/src/OpenFOAM/global \
-# $(WM_PROJECT_DIR)/src/OpenFOAM/containers \
-# $(WM_PROJECT_DIR)/src/OpenFOAM/primitives \
-# $(WM_PROJECT_DIR)/sampling \
-# $(WM_PROJECT_DIR)/src/finiteVolume/fvMesh
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.H \
- *.C
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = */lnInclude/* \
- */t/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER = $(WM_PROJECT_DIR)/bin/tools/doxyFilter
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 1
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# If the HTML_FOOTER_DESCRIPTION tag is set to YES, Doxygen will
-# add generated date, project name and doxygen version to HTML footer.
-
-HTML_FOOTER_DESCRIPTION= NO
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER = $(WM_PROJECT_DIR)/doc/doxygen/_Header
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER = $(WM_PROJECT_DIR)/doc/doxygen/_Footer
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP = NO
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment, introduced with OSX 10.5 (Leopard). To create a documentation
-# set, doxygen will generate a Makefile in the HTML output directory. Running
-# make will produce the docset in that directory and running "make install" will
-# install the docset in ~/Library/Developer/Shared/Documentation/DocSets so that
-# Xcode will find it at startup. See
-# http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more
-# information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom
-# filter to add.For more information please see <a
-# href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help
-# Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. <a
-# href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help
-# Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as the
-# ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the
-# help appears.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be
-# disabled. For large projects the javascript based search engine can be slow,
-# then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client using
-# Javascript. Doxygen will generate the search PHP script and index file to put
-# on the web server. The advantage of the server based approach is that it
-# scales better to large projects and allows full text search. The disadvances
-# is that it is more difficult to setup and does not have live searching
-# capabilities.
-
-SERVER_BASED_SEARCH = NO
-# old default
-# SERVER_BASED_SEARCH = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES = $(WM_PROJECT_DIR)/doc/Doxygen/Macros/tensorOperator
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with
-# syntax highlighting in the LaTeX output. Note that which sources are shown
-# also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = NO
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE = DTAGS
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = YES
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This font
-# does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = YES
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 3
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = YES
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/doc/doxygen/OpenFOAMicon.png b/doc/doxygen/OpenFOAMicon.png
deleted file mode 100644
index 568b0060908a05c84cc9e9a707e65ddd43949d2b..0000000000000000000000000000000000000000
Binary files a/doc/doxygen/OpenFOAMicon.png and /dev/null differ
diff --git a/doc/doxygen/css/img/OpenCFDlogo.png b/doc/doxygen/css/img/OpenCFDlogo.png
deleted file mode 100644
index 15c03032cad560b323539fd1567fcdac036612da..0000000000000000000000000000000000000000
Binary files a/doc/doxygen/css/img/OpenCFDlogo.png and /dev/null differ
diff --git a/etc/cellModels b/etc/cellModels
index 41e8f9dea9688152123a798622631c64eacbf1af..7cfc7f3a7d6b44131500d7415b1876ce20c305d6 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 9b4f9137aa8a05dd4914a07e9a60db670b3af401..86a5287904541d94a20f57259fe78bc585487c2a 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -80,7 +80,7 @@ case [0-9]*:
endsw
-set paraviewInstDir=$WM_THIRD_PARTY_DIR/paraview-${ParaView_VERSION}
+set paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-${ParaView_VERSION}
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-${ParaView_VERSION}
# set paths if binaries or source are present
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index 331f3092dd5f3f851ef612dd51269d0c18678ecf..9ffd68d284df1f610ea2398c5d15325f6f60432b 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -88,7 +88,7 @@ case "$ParaView_VERSION" in
esac
export ParaView_VERSION ParaView_MAJOR
-paraviewInstDir=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
+paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-$ParaView_VERSION
# set paths if binaries or source are present
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 986a35a1b6185b14318855abafdab83fd59c1d23..6b5f43dbc8d78406b1f5c2abfdc731d9d05024fc 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -236,8 +236,8 @@ case ThirdParty:
# using clang - not gcc
setenv WM_CC 'clang'
setenv WM_CXX 'clang++'
- #set clang_version=llvm-2.8
- set clang_version=llvm-svn
+ set clang_version=llvm-2.9
+ #set clang_version=llvm-svn
breaksw
default:
echo
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 086ab174c9c7a2abf983f093a58a349cfdc4a26b..4e801efd8323bb43d7707972fcd4594b78d3df6b 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -253,8 +253,8 @@ OpenFOAM | ThirdParty)
# using clang - not gcc
export WM_CC='clang'
export WM_CXX='clang++'
- #clang_version=llvm-2.8
- clang_version=llvm-svn
+ clang_version=llvm-2.9
+ #clang_version=llvm-svn
;;
*)
echo
diff --git a/etc/controlDict b/etc/controlDict
index ccda0cc7239586a6903cc47900bf809b4d443393..7041fc67999ae0436d11e3b8e2d6debb3b7cb40c 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0 |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 0497c75e8d45d780228f48fcfee695c61238bc38..0c70cdc82e7b984c90218bfe079e78356f23db64 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -435,8 +435,7 @@ Ostream& operator<<(Ostream&, const token::compound&);
#define defineCompoundTypeName(Type, Name) \
- typedef token::Compound<Type> tokenCompound##Name##_; \
- defineTemplateTypeNameAndDebugWithName(tokenCompound##Name##_, #Type, 0);
+ defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
#define addCompoundToRunTimeSelectionTable(Type, Name) \
token::compound::addIstreamConstructorToTable<token::Compound<Type> > \
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 8e509a738b88b25ae00a6c219e80d2371acc7a9f..e90758dafd1dc70fb12d361815c4d81a6aa56349 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -25,6 +25,7 @@ License
#include "Time.H"
#include "PstreamReduceOps.H"
+#include "argList.H"
#include <sstream>
@@ -215,7 +216,8 @@ Foam::Time::Time
const fileName& rootPath,
const fileName& caseName,
const word& systemName,
- const word& constantName
+ const word& constantName,
+ const bool enableFunctionObjects
)
:
TimePaths
@@ -259,7 +261,94 @@ Foam::Time::Time
graphFormat_("raw"),
runTimeModifiable_(true),
- functionObjects_(*this)
+ functionObjects_(*this, enableFunctionObjects)
+{
+ libs_.open(controlDict_, "libs");
+
+ // Explicitly set read flags on objectRegistry so anything constructed
+ // from it reads as well (e.g. fvSolution).
+ readOpt() = IOobject::MUST_READ_IF_MODIFIED;
+
+ setControls();
+
+ // Time objects not registered so do like objectRegistry::checkIn ourselves.
+ if (runTimeModifiable_)
+ {
+ monitorPtr_.reset
+ (
+ new fileMonitor
+ (
+ regIOobject::fileModificationChecking == inotify
+ || regIOobject::fileModificationChecking == inotifyMaster
+ )
+ );
+
+ // File might not exist yet.
+ fileName f(controlDict_.filePath());
+
+ if (!f.size())
+ {
+ // We don't have this file but would like to re-read it.
+ // Possibly if in master-only reading mode. Use a non-existing
+ // file to keep fileMonitor synced.
+ f = controlDict_.objectPath();
+ }
+
+ controlDict_.watchIndex() = addWatch(f);
+ }
+}
+
+
+Foam::Time::Time
+(
+ const word& controlDictName,
+ const argList& args,
+ const word& systemName,
+ const word& constantName
+)
+:
+ TimePaths
+ (
+ args.rootPath(),
+ args.caseName(),
+ systemName,
+ constantName
+ ),
+
+ objectRegistry(*this),
+
+ libs_(),
+
+ controlDict_
+ (
+ IOobject
+ (
+ controlDictName,
+ system(),
+ *this,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
+ )
+ ),
+
+ startTimeIndex_(0),
+ startTime_(0),
+ endTime_(0),
+
+ stopAt_(saEndTime),
+ writeControl_(wcTimeStep),
+ writeInterval_(GREAT),
+ purgeWrite_(0),
+ subCycling_(false),
+
+ writeFormat_(IOstream::ASCII),
+ writeVersion_(IOstream::currentVersion),
+ writeCompression_(IOstream::UNCOMPRESSED),
+ graphFormat_("raw"),
+ runTimeModifiable_(true),
+
+ functionObjects_(*this, !args.optionFound("noFunctionObjects"))
{
libs_.open(controlDict_, "libs");
@@ -303,7 +392,8 @@ Foam::Time::Time
const fileName& rootPath,
const fileName& caseName,
const word& systemName,
- const word& constantName
+ const word& constantName,
+ const bool enableFunctionObjects
)
:
TimePaths
@@ -348,7 +438,7 @@ Foam::Time::Time
graphFormat_("raw"),
runTimeModifiable_(true),
- functionObjects_(*this)
+ functionObjects_(*this, enableFunctionObjects)
{
libs_.open(controlDict_, "libs");
@@ -395,7 +485,8 @@ Foam::Time::Time
const fileName& rootPath,
const fileName& caseName,
const word& systemName,
- const word& constantName
+ const word& constantName,
+ const bool enableFunctionObjects
)
:
TimePaths
@@ -439,7 +530,7 @@ Foam::Time::Time
graphFormat_("raw"),
runTimeModifiable_(true),
- functionObjects_(*this)
+ functionObjects_(*this, enableFunctionObjects)
{
libs_.open(controlDict_, "libs");
}
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index b9da549895fafc7975d4eb92af4bdf023ef61b8d..216ae129858ab3ecac0605be5ec52f3a89c65a68 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -57,6 +57,8 @@ SourceFiles
namespace Foam
{
+// Forward declaration of classes
+class argList;
/*---------------------------------------------------------------------------*\
Class Time Declaration
@@ -184,14 +186,24 @@ public:
// Constructors
- //- Construct given name, rootPath and casePath
+ //- Construct given name of dictionary to read and argument list
+ Time
+ (
+ const word& name,
+ const argList& args,
+ const word& systemName = "system",
+ const word& constantName = "constant"
+ );
+
+ //- Construct given name of dictionary to read, rootPath and casePath
Time
(
const word& name,
const fileName& rootPath,
const fileName& caseName,
const word& systemName = "system",
- const word& constantName = "constant"
+ const word& constantName = "constant",
+ const bool enableFunctionObjects = true
);
//- Construct given dictionary, rootPath and casePath
@@ -201,7 +213,8 @@ public:
const fileName& rootPath,
const fileName& caseName,
const word& systemName = "system",
- const word& constantName = "constant"
+ const word& constantName = "constant",
+ const bool enableFunctionObjects = true
);
//- Construct given endTime, rootPath and casePath
@@ -210,7 +223,8 @@ public:
const fileName& rootPath,
const fileName& caseName,
const word& systemName = "system",
- const word& constantName = "constant"
+ const word& constantName = "constant",
+ const bool enableFunctionObjects = true
);
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index fba0cefe17f0ae0d80b90e03fd5047cf7dd8dc5c..75e129e271480fe0b33eda47e26db7af840c890c 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -64,6 +64,12 @@ Foam::argList::initValidTables::initValidTables()
);
validParOptions.set("roots", "(dir1 .. dirN)");
+ argList::addBoolOption
+ (
+ "noFunctionObjects",
+ "do not execute functionObjects"
+ );
+
Pstream::addValidParOptions(validParOptions);
}
diff --git a/src/OpenFOAM/include/createTime.H b/src/OpenFOAM/include/createTime.H
index 057814a8708a767ecdd07470abaef6779136dffe..36fc675dc36acf76061de0263f02eebb90567d2c 100644
--- a/src/OpenFOAM/include/createTime.H
+++ b/src/OpenFOAM/include/createTime.H
@@ -4,9 +4,4 @@
Foam::Info<< "Create time\n" << Foam::endl;
- Foam::Time runTime
- (
- Foam::Time::controlDictName,
- args.rootPath(),
- args.caseName()
- );
+ Foam::Time runTime(Foam::Time::controlDictName, args);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 352a826cab07fb1a5ee482b24931ab04c485e526..51f0887b5ecda076c6ee316ec298858b367d85fd 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -573,8 +573,10 @@ Foam::label Foam::cyclicPolyPatch::getConsistentRotationFace
{
// Determine a face furthest away from the axis
- const scalarField magRadSqr =
- magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
+ const scalarField magRadSqr
+ (
+ magSqr((faceCentres - rotationCentre_) ^ rotationAxis_)
+ );
label rotFace = findMax(magRadSqr);
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
index bd85bb8677559619229db40f7099ae885958c536..d64471294d39b3552f160dac6a77c55dbe6d56d1 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/pointHitSort.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
@@ -65,7 +65,7 @@ public:
//- Construct null
pointHitSort()
:
- inter_(false, vector::zero, GREAT),
+ inter_(false, vector::zero, GREAT, false),
index_(-1)
{}
@@ -96,9 +96,9 @@ public:
return inter_.distance() == rhs.inter().distance();
}
- bool operator>(const pointHitSort& rhs) const
+ bool operator<(const pointHitSort& rhs) const
{
- return inter_.distance() > rhs.inter().distance();
+ return inter_.distance() < rhs.inter().distance();
}
};
diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict
index aceb9d977b26d66b0898348dc9cccf051373f808..8b7e6686b264e84ff153121a0c66ebcbb02d3e4d 100644
--- a/src/conversion/meshTables/remappingDict
+++ b/src/conversion/meshTables/remappingDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "constant";
object remapping;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,7 +24,6 @@ cellTable
cat1 ( CAT1 "cat1_(Back|Front|Gamma)" );
}
-
// rename boundary regions
// newName oldName;
boundaryRegion
@@ -35,5 +33,4 @@ boundaryRegion
inlet_6 inlet_3;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
index 3c9397314e91638481a640c907c9d4a1b30e624a..b7eda9f46096a32011f6b6b58d94e017c1d53b05 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicMeshDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
index a4f5773bfa5176fe0a5477ffc60f87590d368568..d2b6b6ba2ae3cc229a7bff878d91e6629af55117 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.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
@@ -41,7 +41,7 @@ namespace Foam
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void Foam::actuationDiskSource::checkData()
+void Foam::actuationDiskSource::checkData() const
{
if (magSqr(diskArea_) <= VSMALL)
{
@@ -74,7 +74,6 @@ Foam::actuationDiskSource::actuationDiskSource
)
:
basicSource(name, dict, mesh),
- cellZoneID_(mesh.cellZones().findZoneID(this->cellSetName())),
dict_(dict.subDict(typeName + "Coeffs")),
diskDir_(dict_.lookup("diskDir")),
Cp_(readScalar(dict_.lookup("Cp"))),
@@ -84,20 +83,6 @@ Foam::actuationDiskSource::actuationDiskSource
Info<< " - creating actuation disk zone: "
<< this->name() << endl;
- bool foundZone = (cellZoneID_ != -1);
-
- reduce(foundZone, orOp<bool>());
-
- if (!foundZone && Pstream::master())
- {
- FatalErrorIn
- (
- "Foam::actuationDiskSource::actuationDiskSource"
- "(const word&, const dictionary&, const fvMesh&)"
- ) << "cannot find porous cellZone " << this->name()
- << exit(FatalError);
- }
-
checkData();
}
@@ -106,18 +91,12 @@ Foam::actuationDiskSource::actuationDiskSource
void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
{
- if (cellZoneID_ == -1)
- {
- return;
- }
-
bool compressible = false;
if (UEqn.dimensions() == dimensionSet(1, 1, -2, 0, 0))
{
compressible = true;
}
- const labelList& cells = mesh_.cellZones()[cellZoneID_];
const scalarField& V = this->mesh().V();
vectorField& Usource = UEqn.source();
const vectorField& U = UEqn.psi();
@@ -127,7 +106,7 @@ void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
addActuationDiskAxialInertialResistance
(
Usource,
- cells,
+ cells_,
V,
this->mesh().lookupObject<volScalarField>("rho"),
U
@@ -138,7 +117,7 @@ void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
addActuationDiskAxialInertialResistance
(
Usource,
- cells,
+ cells_,
V,
geometricOneField(),
U
@@ -149,7 +128,6 @@ void Foam::actuationDiskSource::addSu(fvMatrix<vector>& UEqn)
void Foam::actuationDiskSource::writeData(Ostream& os) const
{
-
os << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("name") << this->name() << token::END_STATEMENT << nl;
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
index 6b21973af320f33ce002207d2e13db766a3af994..9646a9641fdf607da6ccbc3be7336c8567f14a46 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/actuationDiskSource/actuationDiskSource.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
@@ -71,9 +71,6 @@ class actuationDiskSource
{
// Private data
- //- Cell zone ID
- label cellZoneID_;
-
//- Sub dictionary with actuationDisk information
const dictionary& dict_;
@@ -93,7 +90,7 @@ class actuationDiskSource
// Private Member Functions
//- Check data
- void checkData();
+ void checkData() const;
//- Add resistance to the UEqn
template<class RhoFieldType>
@@ -139,12 +136,6 @@ public:
// Access
- //- cellZone number
- label zoneId() const
- {
- return cellZoneID_;
- }
-
//- Return Cp
scalar Cp() const
{
@@ -178,15 +169,6 @@ public:
//-Source term to fvMatrix<scalar>
virtual void addSu(fvMatrix<scalar>& UEqn){}
- //- Add all explicit source
- virtual void addExplicitSources(){}
-
- //- Add source to scalar field
- virtual void addSu(DimensionedField<scalar, volMesh>& field){}
-
- //- Add source to vector field
- virtual void addSu(DimensionedField<vector, volMesh>& field){}
-
// I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
index a42ecd25f089cfc0c90c1ca79e47a7b98cfcd051..a5bd0efaedc29c695f48135b8c62186c66868a1f 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.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
@@ -34,62 +34,28 @@ namespace Foam
{
defineTypeNameAndDebug(basicSource, 0);
defineRunTimeSelectionTable(basicSource, dictionary);
-}
-
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-const Foam::wordList Foam::basicSource::selectionModeTypeNames_
-(
- IStringStream("(points cellSet cellZone all)")()
-);
+ // * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-Foam::basicSource::selectionModeType Foam::basicSource::wordToSelectionModeType
-(
- const word& smtName
-) const
-{
- forAll(selectionModeTypeNames_, i)
+ template<> const char* NamedEnum
+ <
+ basicSource::selectionModeType,
+ 4
+ >::names[] =
{
- if (smtName == selectionModeTypeNames_[i])
- {
- return selectionModeType(i);
- }
- }
-
- FatalErrorIn
- (
- "basicSource::selectionModeType"
- "basicSource::wordToSelectionModeType"
- "("
- "const word&"
- ")"
- ) << "Unknown selectionMode type " << smtName
- << ". Valid selectionMode types are:" << nl << selectionModeTypeNames_
- << exit(FatalError);
-
- return selectionModeType(0);
+ "points",
+ "cellSet",
+ "cellZone",
+ "all"
+ };
+
+ const NamedEnum<basicSource::selectionModeType, 4>
+ basicSource::selectionModeTypeNames_;
}
-Foam::word Foam::basicSource::selectionModeTypeToWord
-(
- const selectionModeType& smtType
-) const
-{
- if (smtType > selectionModeTypeNames_.size())
- {
- return "UNKNOWN";
- }
- else
- {
- return selectionModeTypeNames_[smtType];
- }
-}
-
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::basicSource::setSelection(const dictionary& dict)
{
@@ -97,7 +63,7 @@ void Foam::basicSource::setSelection(const dictionary& dict)
{
case smPoints:
{
- // Do nothing. It should be sorted out by derived class
+ dict.lookup("points") >> points_;
break;
}
case smCellSet:
@@ -135,6 +101,29 @@ void Foam::basicSource::setCellSet()
{
case smPoints:
{
+ Info<< indent << "- selecting cells using points" << endl;
+
+ labelHashSet selectedCells;
+
+ forAll(points_, i)
+ {
+ label cellI = mesh_.findCell(points_[i]);
+ if (cellI >= 0)
+ {
+ selectedCells.insert(cellI);
+ }
+
+ label globalCellI = returnReduce(cellI, maxOp<label>());
+ if (globalCellI < 0)
+ {
+ WarningIn("TimeActivatedExplicitSource<Type>::setCellIds()")
+ << "Unable to find owner cell for point " << points_[i]
+ << endl;
+ }
+ }
+
+ cells_ = selectedCells.toc();
+
break;
}
case smCellSet:
@@ -181,19 +170,16 @@ void Foam::basicSource::setCellSet()
}
// Set volume information
- if (selectionMode_ != smPoints)
+ V_ = 0.0;
+ forAll(cells_, i)
{
- V_ = 0.0;
- forAll(cells_, i)
- {
- V_ += mesh_.V()[cells_[i]];
- }
- reduce(V_, sumOp<scalar>());
-
- Info<< indent << "- selected "
- << returnReduce(cells_.size(), sumOp<label>())
- << " cell(s) with volume " << V_ << nl << decrIndent << endl;
+ V_ += mesh_.V()[cells_[i]];
}
+ reduce(V_, sumOp<scalar>());
+
+ Info<< indent << "- selected "
+ << returnReduce(cells_.size(), sumOp<label>())
+ << " cell(s) with volume " << V_ << nl << decrIndent << endl;
}
@@ -212,9 +198,9 @@ Foam::basicSource::basicSource
active_(readBool(dict_.lookup("active"))),
timeStart_(readScalar(dict_.lookup("timeStart"))),
duration_(readScalar(dict_.lookup("duration"))),
- selectionMode_(wordToSelectionModeType(dict_.lookup("selectionMode"))),
+ selectionMode_(selectionModeTypeNames_.read(dict_.lookup("selectionMode"))),
cellSetName_("none"),
- V_(1.0)
+ V_(0.0)
{
setSelection(dict_);
@@ -231,12 +217,12 @@ Foam::autoPtr<Foam::basicSource> Foam::basicSource::New
const fvMesh& mesh
)
{
- word typeModel(dict.lookup("typeModel"));
+ word modelType(dict.lookup("type"));
- Info<< "Selecting model type " << typeModel << endl;
+ Info<< "Selecting model type " << modelType << endl;
dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(typeModel);
+ dictionaryConstructorTablePtr_->find(modelType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
@@ -244,7 +230,7 @@ Foam::autoPtr<Foam::basicSource> Foam::basicSource::New
(
"basicSource::New(const volVectorField&, "
"const surfaceScalarField&, transportModel&)"
- ) << "Unknown Model type " << typeModel
+ ) << "Unknown Model type " << modelType
<< nl << nl
<< "Valid model types are :" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
index 39f4377adb2757be53c80da459bbc0f2fd3d44c7..24a6952c52f4e720fd8327b06b5312813c3a6511 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSource.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
@@ -31,7 +31,7 @@ Description
source1
{
- typeModel actuationDiskSource; // explicitSource
+ type actuationDiskSource; // explicitSource
active on; // on/off switch
timeStart 0.0; // start time
duration 1000.0; // duration
@@ -49,7 +49,7 @@ Description
source2
{
- typeModel explicitSource;
+ type explicitSource;
active on;
timeStart 0.0;
duration 1000.0;
@@ -115,7 +115,7 @@ public:
};
//- Word list of selection mode type names
- static const wordList selectionModeTypeNames_;
+ static const NamedEnum<selectionModeType, 4> selectionModeTypeNames_;
protected:
@@ -146,6 +146,9 @@ protected:
//- Name of cell set for "cellSet" and "cellZone" selectionMode
word cellSetName_;
+ //- List of points for "points" selectionMode
+ List<point> points_;
+
//- Set of cells to apply source to
labelList cells_;
@@ -155,12 +158,6 @@ protected:
// Protected functions
- //- Helper function to convert from a word to a selectionModeType
- selectionModeType wordToSelectionModeType(const word& smtName) const;
-
- //- Helper function to convert from a selectionModeType to a word
- word selectionModeTypeToWord(const selectionModeType& smtType) const;
-
//- Set the cellSet or points selection
void setSelection(const dictionary& dict);
@@ -305,9 +302,6 @@ public:
// Edit
- //- Return access to the source name
- inline word& name();
-
//- Return access to the source active flag
inline bool& active();
@@ -317,22 +311,6 @@ public:
//- Return access to the duration
inline scalar& duration();
- //- Return access to the cell selection mode
- inline selectionModeType& selectionMode();
-
- //- Return access to the list of points for "points" selectionMode
- inline List<point>& points();
-
- //- Return access to the name of cell set for "cellSet"
- // selectionMode
- inline word& cellSetName();
-
- //- Return access to the total cell volume
- inline scalar& V();
-
- //- Return access to the cell set
- inline labelList& cells();
-
// Checks
@@ -342,15 +320,6 @@ public:
// Evaluation
- //- Add all explicit sources
- virtual void addExplicitSources() = 0;
-
- //- Add source to scalar field
- virtual void addSu(DimensionedField<scalar, volMesh>& field) = 0;
-
- //- Add source to vector field
- virtual void addSu(DimensionedField<vector, volMesh>& field) = 0;
-
//- Add source term to vector fvMatrix
virtual void addSu(fvMatrix<vector>& Eqn) = 0;
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
index fca34ab1d92afc1aafec6d88de0513bf23078e99..27300080058560fee1f0464dd8090c36d40b16a5 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceI.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
@@ -92,12 +92,6 @@ inline const Foam::labelList& Foam::basicSource::cells() const
}
-inline Foam::word& Foam::basicSource::name()
-{
- return name_;
-}
-
-
inline bool& Foam::basicSource::active()
{
return active_;
@@ -116,29 +110,4 @@ inline Foam::scalar& Foam::basicSource::duration()
}
-inline Foam::word& Foam::basicSource::cellSetName()
-{
- return cellSetName_;
-}
-
-
-inline Foam::basicSource::selectionModeType&
-Foam::basicSource::selectionMode()
-{
- return selectionMode_;
-}
-
-
-inline Foam::scalar& Foam::basicSource::V()
-{
- return V_;
-}
-
-
-inline Foam::labelList& Foam::basicSource::cells()
-{
- return cells_;
-}
-
-
// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
index 9d2a7c74a1b03d35c1e225a502f7d3d23a4fe916..303631f8b6c2697bdfbb7e69509b02c2776a6d2c 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceIO.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
@@ -36,12 +36,14 @@ void Foam::basicSource::writeData(Ostream& os) const
os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
os.writeKeyword("selectionMode")
- << selectionModeTypeToWord(selectionMode_) << nl;
+ << selectionModeTypeNames_[selectionMode_] << nl;
switch (selectionMode_)
{
case smPoints:
{
+ os.writeKeyword("points") << points_
+ << token::END_STATEMENT << nl;
break;
}
case smCellSet:
@@ -50,17 +52,21 @@ void Foam::basicSource::writeData(Ostream& os) const
<< token::END_STATEMENT << nl;
break;
}
+ case smCellZone:
+ {
+ os.writeKeyword("cellZone") << cellSetName_
+ << token::END_STATEMENT << nl;
+ break;
+ }
+ case smAll:
+ {
+ break;
+ }
default:
{
- FatalErrorIn
- (
- "basicSource::writeData"
- "("
- "Ostream&, "
- "bool"
- ") const"
- ) << "Unknown selectionMode "
- << selectionModeTypeToWord(selectionMode_)
+ FatalErrorIn("basicSource::writeData(Ostream&) const")
+ << "Unknown selectionMode "
+ << selectionMode_
<< abort(FatalError);
}
}
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
index 8b4f1914e8bbb4af8b57c1968777f597724860ea..5b6315f12f0ad0edb2041475c6f817c16c0f200d 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.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
@@ -90,56 +90,15 @@ void Foam::basicSourceList::addSu(fvMatrix<vector>& Eqn)
}
-void Foam::basicSourceList::addExplicitSources()
-{
-
- forAll(*this, i)
- {
- if (this->operator[](i).isActive())
- {
- this->operator[](i).addExplicitSources();
- }
- }
-}
-
-
-void Foam::basicSourceList::addSu
-(
- DimensionedField<scalar, volMesh>& field
-)
-{
- forAll(*this, i)
- {
- if (this->operator[](i).isActive())
- {
- this->operator[](i).addSu(field);
- }
- }
-}
-
-
-void Foam::basicSourceList::addSu
-(
- DimensionedField<vector, volMesh>& field
-)
-{
- forAll(*this, i)
- {
- if (this->operator[](i).isActive())
- {
- this->operator[](i).addSu(field);
- }
- }
-}
-
-
bool Foam::basicSourceList::read(const dictionary& dict)
{
+ bool allOk = true;
forAll(*this, i)
{
- this->operator[](i).read(dict);
+ bool ok = this->operator[](i).read(dict);
+ allOk = (allOk && ok);
}
- return true;
+ return allOk;
}
@@ -162,7 +121,7 @@ bool Foam::basicSourceList::writeData(Ostream& os) const
os << token::END_LIST << token::END_STATEMENT << nl;
// Check state of IOstream
- return os.good();
+ return os.good();
}
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
index 678166f16a0485f4e653d12d19789f2c55e74708..02cd801cc0aef69db299c00e7d121507c4e23998 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/basicSource/basicSourceList.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
@@ -86,15 +86,6 @@ public:
// Evaluation
- //- Add all explicit sources
- void addExplicitSources();
-
- //- Add source to scalar field
- void addSu(DimensionedField<scalar, volMesh>& field);
-
- //- Add source to vector field
- void addSu(DimensionedField<vector, volMesh>& field);
-
//- Add source terms to scalar fvMatrix
void addSu(fvMatrix<scalar>& Eq);
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
index 493408d0ea01b2cdb5de3ee5add5cb8e5b47ea6d..7c798af97e3524dc1a18dca6bea9c693815bd41e 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.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
@@ -40,86 +40,27 @@ namespace Foam
explicitSource,
dictionary
);
-}
-
-const Foam::wordList Foam::explicitSource::volumeModeTypeNames_
-(
- IStringStream("(absolute specific)")()
-);
-
-// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void Foam::explicitSource::setSelectedCellsFromPoints()
-{
- labelHashSet selectedCells;
+ // * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
- forAll(points_, i)
+ template<> const char* NamedEnum
+ <
+ explicitSource::volumeModeType,
+ 2
+ >::names[] =
{
- label cellI = this->mesh().findCell(points_[i]);
- if (cellI >= 0)
- {
- selectedCells.insert(cellI);
- }
-
- label globalCellI = returnReduce(cellI, maxOp<label>());
+ "absolute",
+ "specific"
+ };
- if (globalCellI < 0)
- {
- WarningIn("explicitSource::setSelectedCellsFromPoints()")
- << "Unable to find owner cell for point " << points_[i]
- << endl;
- }
- }
-
- this->cells() = selectedCells.toc();
+ const NamedEnum<explicitSource::volumeModeType, 2>
+ explicitSource::volumeModeTypeNames_;
}
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-Foam::explicitSource::volumeModeType
-Foam::explicitSource::wordToVolumeModeType
-(
- const word& vmtName
-) const
-{
- forAll(volumeModeTypeNames_, i)
- {
- if (vmtName == volumeModeTypeNames_[i])
- {
- return volumeModeType(i);
- }
- }
-
- FatalErrorIn
- (
- "explicitSource<Type>::volumeModeType"
- "explicitSource<Type>::wordToVolumeModeType(const word&)"
- ) << "Unknown volumeMode type " << vmtName
- << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
- << exit(FatalError);
-
- return volumeModeType(0);
-}
-
-
-Foam::word Foam::explicitSource::volumeModeTypeToWord
-(
- const volumeModeType& vmtType
-) const
-{
- if (vmtType > volumeModeTypeNames_.size())
- {
- return "UNKNOWN";
- }
- else
- {
- return volumeModeTypeNames_[vmtType];
- }
-}
-
-
void Foam::explicitSource::setFieldData(const dictionary& dict)
{
scalarFields_.clear();
@@ -170,83 +111,22 @@ Foam::explicitSource::explicitSource
)
:
basicSource(name, dict, mesh),
- scalarFields_(0, *this),
- vectorFields_(0, *this),
dict_(dict.subDict(typeName + "Coeffs")),
- volumeMode_(wordToVolumeModeType(dict_.lookup("volumeMode"))),
- points_(),
- volSource_(this->cells().size(), 1.0)
+ volumeMode_(volumeModeTypeNames_.read(dict_.lookup("volumeMode")))
{
setFieldData(dict_.subDict("fieldData"));
-
- // Set points if selectionMode is smPoints
- if (this->selectionMode() == smPoints)
- {
- dict_.lookup("points") >> points_;
- setSelectedCellsFromPoints();
- volSource_.setSize(points_.size(), 1.0);
- }
-
- const labelList& cellList = this->cells();
- scalar V = 0.0;
- if (volumeMode_ == vmAbsolute)
- {
- forAll(cellList, cellI)
- {
- volSource_[cellI] = mesh.V()[cellList[cellI]];
- V += volSource_[cellI];
- }
- }
- else
- {
- forAll(cellList, cellI)
- {
- V += mesh.V()[cellList[cellI]];
- }
- }
-
- reduce(V, sumOp<scalar>());
-
- Info<< "- selected " << returnReduce(cellList.size(), sumOp<label>())
- << " cell(s) with Volume: " << V << " in time activated sources "
- << endl;
}
void Foam::explicitSource::addSu(fvMatrix<scalar>& Eqn)
{
- Field<scalar>& source = Eqn.source();
- scalar data = scalarFields_[Eqn.psi().name()];
- addSources<scalar>(source, data);
+ addSource(Eqn, scalarFields_[Eqn.psi().name()]);
}
void Foam::explicitSource::addSu(fvMatrix<vector>& Eqn)
{
- Field<vector>& source = Eqn.source();
- vector data = vectorFields_[Eqn.psi().name()];
- addSources<vector>(source, data);
-}
-
-
-void Foam::explicitSource::addSu(DimensionedField<scalar, volMesh>& field)
-{
- scalar data = scalarFields_[field.name()];
- addSources<scalar>(field, data);
-}
-
-
-void Foam::explicitSource::addSu(DimensionedField<vector, volMesh>& field)
-{
- vector data = vectorFields_[field.name()];
- addSources<vector>(field, data);
-}
-
-
-void Foam::explicitSource::addExplicitSources()
-{
- scalarFields_.applySources();
- vectorFields_.applySources();
+ addSource(Eqn, vectorFields_[Eqn.psi().name()]);
}
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
index b2a930b27f9a86aa1686acd6d8a6f657fe17e932..3f014714f94fc0a31da3aa729802a71aae585eb5 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSource.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
@@ -70,60 +70,15 @@ class explicitSource
:
public basicSource
{
- // Private classes
-
- template<class Type>
- class fieldList
- :
- public HashTable<Type>
- {
-
- explicitSource& OwnerPtr_;
-
- public:
-
- //- null Constructor
- fieldList()
- :
- HashTable<Type>(0),
- OwnerPtr_(*reinterpret_cast<explicitSource*>(0))
- {}
-
-
- //- Constructor
- fieldList(label size, explicitSource& ownerPtr)
- :
- HashTable<Type>(size),
- OwnerPtr_(ownerPtr)
- {}
-
-
- void applySources()
- {
- typedef GeometricField<Type, fvPatchField, volMesh>
- geometricField;
-
- forAll(this->toc(), i)
- {
- geometricField& field = const_cast<geometricField&>
- (
- OwnerPtr_.mesh().template lookupObject<geometricField>
- (this->toc()[i])
- );
-
- Type data = this->operator[](field.name());
- OwnerPtr_.addSources<Type>(field.internalField(), data);
- }
- }
- };
-
-private:
-
- // Private cdata
+ // Private data
//- List of field types
- fieldList<scalar> scalarFields_;
- fieldList<vector> vectorFields_;
+ HashTable<scalar> scalarFields_;
+ HashTable<vector> vectorFields_;
+
+ //- Add source to matrix
+ template<class Type>
+ void addSource(fvMatrix<Type>&, const Type&) const;
//- Add field names and values to field table for types.
template<class Type>
@@ -132,22 +87,12 @@ private:
HashTable<Type>& fields,
const wordList& fieldTypes,
const wordList& fieldNames,
- const dictionary& dict_
+ const dictionary& dict
);
- //- Add data to field source
- template<class Type>
- void addSources
- (
- Field<Type>& fieldSource,
- Type& data
- ) const;
-
-
public:
-
// Public data
//- Enumeration for volume types
@@ -158,7 +103,7 @@ public:
};
//- Word list of volume mode type names
- static const wordList volumeModeTypeNames_;
+ static const NamedEnum<volumeModeType, 2> volumeModeTypeNames_;
protected:
@@ -171,27 +116,12 @@ protected:
//- Volume mode
volumeModeType volumeMode_;
- //- List of points for "points" selectionMode
- List<point> points_;
-
- //- Volume of the explicit source
- scalarList volSource_;
-
// Protected functions
- //- Helper function to convert from a word to a volumeModeType
- volumeModeType wordToVolumeModeType(const word& vtName) const;
-
- //- Helper function to convert from a volumeModeType to a word
- word volumeModeTypeToWord(const volumeModeType& vtType) const;
-
//- Set the local field data
void setFieldData(const dictionary& dict);
- //- Set selected cells when smPoint is used
- void setSelectedCellsFromPoints();
-
public:
@@ -246,15 +176,6 @@ public:
//-Source term to fvMatrix<scalar>
virtual void addSu(fvMatrix<scalar>& UEqn);
- //- Add all explicit source
- virtual void addExplicitSources();
-
- //- Add source to scalar field
- virtual void addSu(DimensionedField<vector, volMesh>& field);
-
- //- Add source to vector field
- virtual void addSu(DimensionedField<scalar, volMesh>& field);
-
// I-O
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
index 6ba8c3571fb6cc9205940ce9968935a2a86401a2..3424c6ee8228e80427cd746dbeea87540306d17c 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceI.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
@@ -46,4 +46,6 @@ Foam::explicitSource::points() const
{
return points_;
}
+
+
// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
index 04eeaba93ef5e9671672d303a072dd760ea6e350..c30ac1aac1f643e3c928e0ab3365365ff32a3f3b 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.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
@@ -32,7 +32,7 @@ void Foam::explicitSource::writeData(Ostream& os) const
os << indent << name_ << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl;
- os.writeKeyword("volumeMode") << volumeModeTypeToWord(volumeMode_)
+ os.writeKeyword("volumeMode") << volumeModeTypeNames_[volumeMode_]
<< token::END_STATEMENT << nl;
if (scalarFields_.size() > 0)
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C
index 20e9230e9938e95e2d03c61b73a03c4e18a649c4..be96da8c614e42eeba84e994d89117015679722c 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.C
+++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceTemplates.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
@@ -23,17 +23,42 @@ License
\*---------------------------------------------------------------------------*/
-template<class Type>
-void Foam::explicitSource::addSources
+template <class Type>
+void Foam::explicitSource::addSource
(
- Field<Type>& fieldSource,
- Type& data
+ fvMatrix<Type>& Eqn,
+ const Type& sourceData
) const
{
- forAll(this->cells(), i)
+ Type data = sourceData;
+ if (volumeMode_ == vmAbsolute)
{
- fieldSource[this->cells()[i]] = data/volSource_[i];
+ // Convert to specific quantity
+ data /= V_;
}
+
+ DimensionedField<Type, volMesh> rhs
+ (
+ IOobject
+ (
+ "rhs",
+ Eqn.psi().mesh().time().timeName(),
+ Eqn.psi().mesh(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ Eqn.psi().mesh(),
+ dimensioned<Type>
+ (
+ "zero",
+ Eqn.dimensions()/dimVolume,
+ pTraits<Type>::zero
+ )
+ );
+ UIndirectList<Type>(rhs, this->cells()) = data;
+
+ Eqn -= rhs;
}
diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index ee17dd7e3cad16d131e00609d03b11164a86ad31..eee987f560dfa40a56bfaf029378e14e9fc373e4 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -24,51 +24,12 @@ License
\*---------------------------------------------------------------------------*/
#include "coalCloud.H"
-
-#include "makeParcelCloudFunctionObjects.H"
-
-// Kinematic
-#include "makeThermoParcelForces.H" // thermo variant
-#include "makeParcelDispersionModels.H"
-#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelPatchInteractionModels.H"
-
-// Thermodynamic
-#include "makeParcelHeatTransferModels.H"
-
-// Reacting
-#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
-#include "makeReactingParcelPhaseChangeModels.H"
-#include "makeReactingParcelSurfaceFilmModels.H"
-
-// Reacting multiphase
-#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
-
-// Coal specific
#include "makeCoalParcelSurfaceReactionModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- makeParcelCloudFunctionObjects(coalCloud);
-
- // Kinematic sub-models
- makeThermoParcelForces(coalCloud);
- makeParcelDispersionModels(coalCloud);
- makeReactingMultiphaseParcelInjectionModels(coalCloud);
- makeParcelPatchInteractionModels(coalCloud);
-
- // Thermo sub-models
- makeParcelHeatTransferModels(coalCloud);
-
- // Reacting sub-models
- makeReactingMultiphaseParcelCompositionModels(coalCloud);
- makeReactingParcelPhaseChangeModels(coalCloud);
-
- // Reacting multiphase sub-models
- makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
- makeReactingParcelSurfaceFilmModels(coalCloud);
makeCoalParcelSurfaceReactionModels(coalCloud);
}
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 781f0c6d4714c61be48e278efbb7e6dd6e02fa75..cfdf74b5b0648246a1d400ea4ddf945f11e3f3b2 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -37,8 +37,6 @@ License
#define makeCoalParcelSurfaceReactionModels(CloudType) \
\
- makeSurfaceReactionModel(CloudType); \
- makeSurfaceReactionModelType(NoSurfaceReaction, CloudType); \
makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType); \
makeSurfaceReactionModelType \
( \
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
index 54dc027235e84b6791c193e5d94b4ab10d2a4a5e..71c88a37b4d32b245f7d37b6254ff43eccf23dae 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -327,17 +327,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch) \
- template<> \
- const Foam::word DsmcParcel<Type>::typeName(#Type); \
- template<> \
- int DsmcParcel<Type>::debug \
- ( \
- Foam::debug::debugSwitch(#Type, DebugSwitch) \
- );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#ifdef NoRepository
#include "DsmcParcel.C"
#endif
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
index c05fb93aedcf7659502e55279b51069c687c9389..704541f4f019a0342bc9d42c5d54bbc40902ae86 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -31,7 +31,6 @@ namespace Foam
{
// defineTypeNameAndDebug(dsmcParcel, 0);
// defineParticleTypeNameAndDebug(dsmcParcel, 0);
-// defineParcelTypeNameAndDebug(dsmcParcel, 0);
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 7e3785ded37a631eaf07be9f3a16504fa12d1606..7b2f8268f48fce1cfd175a6fd865d84a09baacd3 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -687,17 +687,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch) \
- template<> \
- const Foam::word KinematicParcel<Type>::typeName(#Type); \
- template<> \
- int KinematicParcel<Type>::debug \
- ( \
- Foam::debug::debugSwitch(#Type, DebugSwitch) \
- );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#ifdef NoRepository
#include "KinematicParcel.C"
#endif
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
index d7e2e9a05285b78158608860252074986a43c6eb..8e18bee7c44cc33e7e3de5652be49d490709e3f9 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H
@@ -32,18 +32,7 @@ inline Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::TrackingData
)
:
ParcelType::template TrackingData<CloudType>(cloud, part),
- Cp_
- (
- IOobject
- (
- "Cp",
- cloud.db().time().timeName(),
- cloud.db(),
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- cloud.thermo().thermo().Cp()
- ),
+ Cp_(cloud.thermo().thermo().Cp()),
TInterp_
(
interpolation<scalar>::New
diff --git a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H b/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
index 51aef7ae3d119361afc11f5d30f240f9af51f432..c3f9361f4e57dca38e50304cce7511f975a75cf1 100644
--- a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
+++ b/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.H
@@ -268,6 +268,9 @@ public:
//- Return access to the underlying mesh
inline const fvMesh& mesh() const;
+
+ //- Return the boundBox of this processor
+ inline const treeBoundBox& procBounds() const;
};
diff --git a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H b/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
index a857ede28525dbf08c2b102a9aaeaa3a19ac0f90..e1da2fe389d2312cdd4b85f14251f47654e08d8b 100644
--- a/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
+++ b/src/mesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionI.H
@@ -30,4 +30,10 @@ const Foam::fvMesh& Foam::backgroundMeshDecomposition::mesh() const
return mesh_;
}
+
+const Foam::treeBoundBox& Foam::backgroundMeshDecomposition::procBounds() const
+{
+ return allBackgroundMeshBounds_[Pstream::myProcNo()];
+}
+
// ************************************************************************* //
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index b0f7ffb187c302f0d203f9ab606734934a9bf4f8..5acce27365f634afa21af643ba72ddf15516e3e6 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -945,6 +945,9 @@ public:
//- Return the conformationSurfaces object
inline const conformationSurfaces& geometryToConformTo() const;
+ //- Return the backgroundMeshDecomposition
+ inline const backgroundMeshDecomposition& decomposition() const;
+
//- Return the cellSizeControlSurfaces object
inline const cellSizeControlSurfaces& cellSizeControl() const;
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 140c1d7070d3050ec7e5cefb961a7736feb5fb4d..73603ff184ad1ca31089a2ab6132b589c89531b8 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -469,6 +469,13 @@ Foam::conformalVoronoiMesh::geometryToConformTo() const
}
+inline const Foam::backgroundMeshDecomposition&
+Foam::conformalVoronoiMesh::decomposition() const
+{
+ return decomposition_();
+}
+
+
inline const Foam::cellSizeControlSurfaces&
Foam::conformalVoronoiMesh::cellSizeControl() const
{
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H b/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
index 2eae6636996122cf4f96aff668a90df80ae59142..36c129fba156293dbba0c096357ff18352fbbfd9 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/initialPointsMethod/initialPointsMethod.H
@@ -37,6 +37,7 @@ SourceFiles
#include "point.H"
#include "conformalVoronoiMesh.H"
+#include "backgroundMeshDecomposition.H"
#include "dictionary.H"
#include "Random.H"
#include "Switch.H"
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
index d5892bd554e1766501f377005707f0a8a382baf1..92c369743aeeffd9ec2d502fd6c9856505c7d9d5 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
@@ -58,7 +58,18 @@ uniformGrid::uniformGrid
std::list<Vb::Point> uniformGrid::initialPoints() const
{
- const boundBox& bb = cvMesh_.geometryToConformTo().globalBounds();
+ boundBox bb;
+
+ // Pick up the bounds of this processor, or the whole geometry, depending
+ // on whether this is a parallel run.
+ if (Pstream::parRun())
+ {
+ bb = cvMesh_.decomposition().procBounds();
+ }
+ else
+ {
+ bb = cvMesh_.geometryToConformTo().globalBounds();
+ }
scalar x0 = bb.min().x();
scalar xR = bb.max().x() - x0;
@@ -82,8 +93,6 @@ std::list<Vb::Point> uniformGrid::initialPoints() const
std::list<Vb::Point> initialPoints;
- List<bool> isSurfacePoint(nk, false);
-
for (label i = 0; i < ni; i++)
{
for (label j = 0; j < nj; j++)
@@ -112,14 +121,34 @@ std::list<Vb::Point> uniformGrid::initialPoints() const
p.z() += pert*(rndGen.scalar01() - 0.5);
}
+ if
+ (
+ Pstream::parRun()
+ && !cvMesh_.decomposition().positionOnThisProcessor(p)
+ )
+ {
+ // Skip this point if, in parallel, this position is not on
+ // this processor.
+ continue;
+ }
+
points[pI++] = p;
}
+ points.setSize(pI);
+
Field<bool> insidePoints = cvMesh_.geometryToConformTo().wellInside
(
points,
minimumSurfaceDistanceCoeffSqr_
- *sqr(cvMesh_.cellSizeControl().cellSize(points, isSurfacePoint))
+ *sqr
+ (
+ cvMesh_.cellSizeControl().cellSize
+ (
+ points,
+ List<bool>(pI, false)
+ )
+ )
);
forAll(insidePoints, i)
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 324e19e51edc4044449c876f9cb97489fc92bab3..cac3aa685c1c0bafcd3b24aebcb47fe05f114636 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -92,6 +92,7 @@ $(cellSources)/zoneToCell/zoneToCell.C
$(cellSources)/sphereToCell/sphereToCell.C
$(cellSources)/cylinderToCell/cylinderToCell.C
$(cellSources)/faceZoneToCell/faceZoneToCell.C
+$(cellSources)/cylinderAnnulusToCell/cylinderAnnulusToCell.C
faceSources = sets/faceSources
$(faceSources)/faceToFace/faceToFace.C
diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
new file mode 100644
index 0000000000000000000000000000000000000000..80ccd4fa9534f2a050766e8aa7657c6cf855c862
--- /dev/null
+++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.C
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "cylinderAnnulusToCell.H"
+#include "polyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(cylinderAnnulusToCell, 0);
+ addToRunTimeSelectionTable(topoSetSource, cylinderAnnulusToCell, word);
+ addToRunTimeSelectionTable(topoSetSource, cylinderAnnulusToCell, istream);
+}
+
+
+Foam::topoSetSource::addToUsageTable Foam::cylinderAnnulusToCell::usage_
+(
+ cylinderAnnulusToCell::typeName,
+ "\n Usage: cylinderAnnulusToCell (p1X p1Y p1Z) (p2X p2Y p2Z)"
+ " outerRadius innerRadius\n\n"
+ " Select all cells with cell centre within bounding cylinder annulus\n\n"
+);
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+void Foam::cylinderAnnulusToCell::combine(topoSet& set, const bool add) const
+{
+ const vector axis = p2_ - p1_;
+ const scalar orad2 = sqr(outerRadius_);
+ const scalar irad2 = sqr(innerRadius_);
+ const scalar magAxis2 = magSqr(axis);
+
+ const pointField& ctrs = mesh_.cellCentres();
+
+ forAll(ctrs, cellI)
+ {
+ vector d = ctrs[cellI] - p1_;
+ scalar magD = d & axis;
+
+ if ((magD > 0) && (magD < magAxis2))
+ {
+ scalar d2 = (d & d) - sqr(magD)/magAxis2;
+ if ((d2 < orad2) && (d2 > irad2))
+ {
+ addOrDelete(set, cellI, add);
+ }
+ }
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::cylinderAnnulusToCell::cylinderAnnulusToCell
+(
+ const polyMesh& mesh,
+ const vector& p1,
+ const vector& p2,
+ const scalar outerRadius,
+ const scalar innerRadius
+)
+:
+ topoSetSource(mesh),
+ p1_(p1),
+ p2_(p2),
+ outerRadius_(outerRadius),
+ innerRadius_(innerRadius)
+{}
+
+
+Foam::cylinderAnnulusToCell::cylinderAnnulusToCell
+(
+ const polyMesh& mesh,
+ const dictionary& dict
+)
+:
+ topoSetSource(mesh),
+ p1_(dict.lookup("p1")),
+ p2_(dict.lookup("p2")),
+ outerRadius_(readScalar(dict.lookup("outerRadius"))),
+ innerRadius_(readScalar(dict.lookup("innerRadius")))
+{}
+
+
+// Construct from Istream
+Foam::cylinderAnnulusToCell::cylinderAnnulusToCell
+(
+ const polyMesh& mesh,
+ Istream& is
+)
+:
+ topoSetSource(mesh),
+ p1_(checkIs(is)),
+ p2_(checkIs(is)),
+ outerRadius_(readScalar(checkIs(is))),
+ innerRadius_(readScalar(checkIs(is)))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::cylinderAnnulusToCell::~cylinderAnnulusToCell()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+void Foam::cylinderAnnulusToCell::applyToSet
+(
+ const topoSetSource::setAction action,
+ topoSet& set
+) const
+{
+ if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
+ {
+ Info<< " Adding cells with centre within cylinder annulus,"
+ << " with p1 = "
+ << p1_ << ", p2 = " << p2_ << " and outer radius = " << outerRadius_
+ << " and inner radius = " << innerRadius_
+ << endl;
+
+ combine(set, true);
+ }
+ else if (action == topoSetSource::DELETE)
+ {
+ Info<< " Removing cells with centre within cylinder, with p1 = "
+ << p1_ << ", p2 = " << p2_ << " and outer radius = " << outerRadius_
+ << " and inner radius " << innerRadius_
+ << endl;
+
+ combine(set, false);
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H
new file mode 100644
index 0000000000000000000000000000000000000000..f9ab221dda5d426e191c646c9ee44d10d7108929
--- /dev/null
+++ b/src/meshTools/sets/cellSources/cylinderAnnulusToCell/cylinderAnnulusToCell.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::cylinderAnnulusToCell
+
+Description
+ A topoSetSource to select cells based on cell centres inside a
+ cylinder annulus.
+
+SourceFiles
+ cylinderAnnulusToCell.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cylinderAnnulusToCell_H
+#define cylinderAnnulusToCell_H
+
+#include "topoSetSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class cylinderAnnulusToCell Declaration
+\*---------------------------------------------------------------------------*/
+
+class cylinderAnnulusToCell
+:
+ public topoSetSource
+{
+
+ // Private data
+
+ //- Add usage string
+ static addToUsageTable usage_;
+
+ //- First point on cylinder axis
+ vector p1_;
+
+ //- Second point on cylinder axis
+ vector p2_;
+
+ //- Outer Radius
+ scalar outerRadius_;
+
+ //- Inner Radius
+ scalar innerRadius_;
+
+
+ // Private Member Functions
+
+ void combine(topoSet& set, const bool add) const;
+
+
+public:
+
+ //- Runtime type information
+ TypeName("cylinderAnnulusToCell");
+
+
+ // Constructors
+
+ //- Construct from components
+ cylinderAnnulusToCell
+ (
+ const polyMesh& mesh,
+ const vector& p1,
+ const vector& p2,
+ const scalar outerRadius,
+ const scalar innerRadius
+ );
+
+ //- Construct from dictionary
+ cylinderAnnulusToCell
+ (
+ const polyMesh& mesh,
+ const dictionary& dict
+ );
+
+ //- Construct from Istream
+ cylinderAnnulusToCell
+ (
+ const polyMesh& mesh,
+ Istream&
+ );
+
+
+ // Destructor
+ virtual ~cylinderAnnulusToCell();
+
+ // Member Functions
+
+ virtual sourceType setType() const
+ {
+ return CELLSETSOURCE;
+ }
+
+ virtual void applyToSet
+ (
+ const topoSetSource::setAction action,
+ topoSet&
+ ) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/controlDict b/src/postProcessing/functionObjects/IO/controlDict
index 4daa3a1c15873c3967e51b137689fbc934bd7894..11ecd9b106b31ea5178dd6b01f5a952f8df7a34e 100644
--- a/src/postProcessing/functionObjects/IO/controlDict
+++ b/src/postProcessing/functionObjects/IO/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.7.1 |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -69,7 +68,7 @@ functions
dumpObjects
{
// Forcibly write registered objects. E.g. fields that have been
- // created with NO_READ.
+ // created with NO_WRITE.
type writeRegisteredObject;
@@ -84,5 +83,4 @@ functions
}
}
-
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 2dd51b37559f11614dc2d9d1c40158fbe8be2c5d..b2a9d6b1bc8601f48c8dc18f50e298e9db0eb642 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
index 69af1ecf50617fed3484dbef6be3404b8b3a6217..3943c6d9a2233cf192eec7f5fb0f421a2993e4ef 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index c7619975f7b36ca09be852a02478553575e5cd16..aaad896c154605d7eb25e269d78dbc1f7772203e 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index ffba10c24fdf8f17175dc30ee8e6c2b7ce0f0f0c..d2d37c4acbec52ac869eb25de9269c1e87cd6cec 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object postProcessingDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/systemCall/controlDict b/src/postProcessing/functionObjects/systemCall/controlDict
index db2105c44060f5ac30679a345ae490d1df2e9c64..f5f97d1b2aa04906cf66f7ba172a12dbfa9bbd80 100644
--- a/src/postProcessing/functionObjects/systemCall/controlDict
+++ b/src/postProcessing/functionObjects/systemCall/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -76,5 +75,4 @@ functions
}
}
-
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index e378ee128bc494f3ad572bdef0ae1e1b63d605e2..84e7b08138fc7f18178fd902f1096303a21e8450 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/probes/probesDict b/src/sampling/probes/probesDict
index af047efe7aa2b9eae84d4a1c44b3d7163957e76a..6759a54535e198a6044416adf1ed9cfacc7fd688 100644
--- a/src/sampling/probes/probesDict
+++ b/src/sampling/probes/probesDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: 2.0.0 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
index f43f4866b9e53217eccba2f945ecfc72c20aa0ae..9e91bc81d2b761494ba66b76d3f27330a5047be2 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.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
@@ -30,7 +30,7 @@ License
template<class ThermoSolidType>
void Foam::multiComponentSolidMixture<ThermoSolidType>::correctMassFractions()
{
- volScalarField Yt = Y_[0];
+ volScalarField Yt("Yt", Y_[0]);
for (label n=1; n<Y_.size(); n++)
{
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C
index 95ca0a7581e4e1db6a633ac789181bfe1f4b6612..8edddfa2bdff38cea5a67088912c94f0aeb3544d 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -121,32 +121,6 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
mesh_,
dimensionedScalar("a", dimless/dimLength, 0.0)
),
- e_
- (
- IOobject
- (
- "e",
- mesh_.time().timeName(),
- mesh_,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- mesh_,
- dimensionedScalar("a", dimless/dimLength, 0.0)
- ),
- E_
- (
- IOobject
- (
- "E",
- mesh_.time().timeName(),
- mesh_,
- IOobject::NO_READ,
- IOobject::NO_WRITE
- ),
- mesh_,
- dimensionedScalar("E", dimMass/dimLength/pow3(dimTime), 0.0)
- ),
nTheta_(readLabel(coeffs_.lookup("nTheta"))),
nPhi_(readLabel(coeffs_.lookup("nPhi"))),
nRay_(0),
diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H
index e87697a78477dfa076682a9d377ade2857fc2932..60e9e44cbf6dddcc065355581ee07f385caee91c 100644
--- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H
+++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H
@@ -92,12 +92,6 @@ class fvDOM
//- Total absorption coefficient [1/m]
volScalarField a_;
- //- Total emission coefficient [1/m]
- volScalarField e_;
-
- //- Emission contribution [Kg/m/s^3]
- volScalarField E_;
-
//- Number of solid angles in theta
label nTheta_;
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 21dfa9786dad656c1ee0f7a71a827fee551384f9..8948182d55755506cb464ce914b176b1ffa2d833 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -27,6 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "unitConversion.H"
#include "zeroGradientFvPatchFields.H"
+#include "basicMultiComponentMixture.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -59,17 +60,24 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
speciesNames_(0),
specieIndex_(0),
lookUpTablePtr_(),
- thermo_
- (
- mesh,
- const_cast<basicThermo&>
- (
- mesh.lookupObject<basicThermo>("thermophysicalProperties")
- )
- ),
+ thermo_(mesh.lookupObject<basicThermo>("thermophysicalProperties")),
EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),
Yj_(nSpecies_)
{
+ if (!isA<basicMultiComponentMixture>(thermo_))
+ {
+ FatalErrorIn
+ (
+ "radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission"
+ "("
+ "const dictionary&, "
+ "const fvMesh&"
+ ")"
+ ) << "Model requires a multi-component thermo package"
+ << abort(FatalError);
+ }
+
+
label nFunc = 0;
const dictionary& functionDicts = dict.subDict(typeName + "Coeffs");
@@ -195,10 +203,12 @@ Foam::radiation::greyMeanAbsorptionEmission::~greyMeanAbsorptionEmission()
Foam::tmp<Foam::volScalarField>
Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
{
- const volScalarField& T = thermo_.thermo().T();
- const volScalarField& p = thermo_.thermo().p();
+ const basicMultiComponentMixture& mixture =
+ dynamic_cast<const basicMultiComponentMixture&>(thermo_);
+
+ const volScalarField& T = thermo_.T();
+ const volScalarField& p = thermo_.p();
- const basicMultiComponentMixture& mixture = thermo_.carrier();
tmp<volScalarField> ta
(
@@ -206,7 +216,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
(
IOobject
(
- "a",
+ "aCont" + name(bandI),
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
@@ -280,7 +290,7 @@ Foam::radiation::greyMeanAbsorptionEmission::eCont(const label bandI) const
(
IOobject
(
- "e",
+ "eCont" + name(bandI),
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
@@ -304,7 +314,7 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
(
IOobject
(
- "E",
+ "ECont" + name(bandI),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
index a41d2adf097ef288a6f6d37c10c9d439c6b1d116..b677dde736f1a4c058b5484bc530cb52a3b94da7 100644
--- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
@@ -89,8 +89,7 @@ SourceFiles
#include "absorptionEmissionModel.H"
#include "HashTable.H"
#include "absorptionCoeffs.H"
-#include "SLGThermo.H"
-//#include "basicThermo.H"
+#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,7 +134,7 @@ private:
mutable autoPtr<interpolationLookUpTable<scalar> > lookUpTablePtr_;
//- SLG thermo package
- SLGThermo thermo_;
+ const basicThermo& thermo_;
//- Emission constant coefficient
const scalar EhrrCoeff_;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 63dc458e0aa547fb35f2e1c862c1b934ad200c29..efb17fdf58fa0afb7787e18e4d60f126c117b818 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.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
@@ -49,7 +49,7 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
template<class ThermoType>
void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
{
- volScalarField Yt = Y_[0];
+ volScalarField Yt("Yt", Y_[0]);
for (label n=1; n<Y_.size(); n++)
{
diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.C b/src/triSurface/triSurfaceFields/triSurfaceFields.C
index d4d7bcff1e97e0d83902786b79f5d2abc7777eec..d32e28cbf68d0f66528c329cd48e24ef2a4c8794 100644
--- a/src/triSurface/triSurfaceFields/triSurfaceFields.C
+++ b/src/triSurface/triSurfaceFields/triSurfaceFields.C
@@ -32,24 +32,36 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+#ifndef __clang__
template<>
+#endif
const word triSurfaceLabelField::typeName("triSurfaceLabelField");
+#ifndef __clang__
template<>
+#endif
const word triSurfaceScalarField::typeName("triSurfaceScalarField");
+#ifndef __clang__
template<>
+#endif
const word triSurfaceVectorField::typeName("triSurfaceVectorField");
+#ifndef __clang__
template<>
+#endif
const word triSurfaceSphericalTensorField::typeName
("triSurfaceSphericalTensorField");
+#ifndef __clang__
template<>
+#endif
const word triSurfaceSymmTensorField::typeName
("triSurfaceSymmTensorField");
+#ifndef __clang__
template<>
+#endif
const word triSurfaceTensorField::typeName("triSurfaceTensorField");
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 6c997ec5b5386067c5c81eca28341c2fc9f37411..07f7cd01b1585b28ec95de7026a75ed350fcf6bc 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.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
@@ -165,7 +165,7 @@ scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
for (int i=0; i<10; i++)
{
- ypl = log(E*ypl)/kappa;
+ ypl = log(max(E*ypl, 1))/kappa;
}
return ypl;
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index 219e4473de6710f23bf10ff3db7d8d91118a327b..b9695da97567468415ed74e8cebfe0e3a6140e2c 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -6,6 +6,26 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
+
+# This case uses the #codeStream which is disabled by default. Enable for
+# just this case.
+MAIN_CONTROL_DICT=`foamEtcFile controlDict`
+if [ -f "$MAIN_CONTROL_DICT" ]
+then
+ echo "Modifying ${MAIN_CONTROL_DICT} to enable allowSystemOperations"
+
+ # Clean up on termination and on Ctrl-C
+ trap 'mv ${MAIN_CONTROL_DICT}.$$ ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \
+ EXIT TERM INT
+ cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.$$
+
+ echo "Enabling allowSystemOperations in ${MAIN_CONTROL_DICT}."
+
+ sed \
+ -e s/"\(allowSystemOperations[ \t]*\)\([0-9]\);"/"\1 1;"/g \
+ ${MAIN_CONTROL_DICT}.$$ > ${MAIN_CONTROL_DICT}
+fi
+
cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
runApplication $application
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 8f10f1fc76e96338628591beb73d9f0880b8737b..dc57a412b06da89ebf1483b9fa577b601b5d46f9 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -94,13 +94,15 @@ functions
Info<< "\nEvaluating analytical solution" << endl;
- volVectorField centres = UA.mesh().C();
- volScalarField magCentres = mag(centres);
- volScalarField theta = acos((centres & vector(1,0,0))/magCentres);
+ const volVectorField& centres = UA.mesh().C();
+ volScalarField magCentres(mag(centres));
+ volScalarField theta(acos((centres & vector(1,0,0))/magCentres));
- volVectorField cs2theta =
+ volVectorField cs2theta
+ (
cos(2*theta)*vector(1,0,0)
- + sin(2*theta)*vector(0,1,0);
+ + sin(2*theta)*vector(0,1,0)
+ );
UA = uInfX*(dimensionedVector(vector(1,0,0))
- pow((radius/magCentres),2)*cs2theta);
@@ -109,8 +111,10 @@ functions
UA.write();
volScalarField error("error", mag(U-UA)/mag(UA));
+
Info<<"Writing relative error in U to " << error.objectPath()
<< endl;
+
error.write();
#};
}
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/U b/tutorials/basic/potentialFoam/pitzDaily/0/U
deleted file mode 100644
index 4959c4d219722a8e5762d7f7c3cdf131d5d6d13e..0000000000000000000000000000000000000000
--- a/tutorials/basic/potentialFoam/pitzDaily/0/U
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- inlet
- {
- type fixedValue;
- value uniform (10 0 0);
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- upperWall
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- lowerWall
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- frontAndBack
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/0/p b/tutorials/basic/potentialFoam/pitzDaily/0/p
deleted file mode 100644
index ae53685d48400e3ce571acda4fa68eaef9bfbb16..0000000000000000000000000000000000000000
--- a/tutorials/basic/potentialFoam/pitzDaily/0/p
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- inlet
- {
- type zeroGradient;
- }
-
- outlet
- {
- type fixedValue;
- value uniform 0;
- }
-
- upperWall
- {
- type zeroGradient;
- }
-
- lowerWall
- {
- type zeroGradient;
- }
-
- frontAndBack
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/Allclean b/tutorials/basic/potentialFoam/pitzDaily/Allclean
similarity index 50%
rename from tutorials/basic/potentialFoam/Allclean
rename to tutorials/basic/potentialFoam/pitzDaily/Allclean
index b81c740007908499f8ef2e3d698009099c41e46e..d16400a94f636d461b62f6f909c2d64d7e29c335 100755
--- a/tutorials/basic/potentialFoam/Allclean
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allclean
@@ -4,22 +4,8 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-(
- cd cylinder || exit
+rm -rf 0 > /dev/null 2>&1
- cleanCase
- rm -rf 0 > /dev/null 2>&1
- cp -r 0.org 0
- wclean analyticalCylinder
-)
-
-
-(
- cd pitzDaily || exit
-
- cleanCase
- rm -rf 0 > /dev/null 2>&1
- cp -r 0.org 0
-)
+cleanCase
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 86fa0fdc4d690ec147a12c56059637bcf3d39e0d..219e4473de6710f23bf10ff3db7d8d91118a327b 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
+cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
runApplication $application
runApplication streamFunction
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
index 07dc128240dd5705bf192dcc6f40d91e770e01a6..151b63f7ced5694f23b3b40ae509e1a84cf474b3 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allclean
@@ -6,5 +6,6 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
-rm -r constant/panelRegion/polyMesh
+rm -rf constant/panelRegion/polyMesh
+
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
index 17b4dd27afd7cd43849767b9d0dc1827ea716a2a..ae53653faa373895e5c55c08070127365a133e34 100755
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun
@@ -1,4 +1,5 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -30,3 +31,5 @@ decomposePar -force > log.decomposePar.log 2>&1
decomposePar -region panelRegion > log.decomposParPanelRegion.log 2>&1
runParallel `getApplication` 6
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
index ae4f537c47fdaa7f83d1fab5bbe94b880863252c..7b434dcad5d079f2807909238b479229c04afbe3 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/thermophysicalProperties
@@ -18,8 +18,8 @@ FoamFile
thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
-
inertSpecie N2;
+
fuel C3H8;
chemistryReader foamChemistryReader;
@@ -29,17 +29,4 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
-liquids
-{
- liquidComponents
- ();
-
- H2O H2O defaultCoeffs;
-}
-
-
-solids
-{
- solidComponents
- ();
-}
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
index f593a1dd1264a63aebc98419d9edacb6369ef97f..e734554750ff1c178f707dc474392182f5444f7b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/thermophysicalProperties
@@ -18,6 +18,7 @@ FoamFile
thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
inertSpecie N2;
+
fuel CH4;
chemistryReader foamChemistryReader;
@@ -26,12 +27,5 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
-liquids
-{
- liquidComponents
- ();
-
- H2O H2O defaultCoeffs;
-}
// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
index f593a1dd1264a63aebc98419d9edacb6369ef97f..e734554750ff1c178f707dc474392182f5444f7b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -18,6 +18,7 @@ FoamFile
thermoType hsPsiMixtureThermo<singleStepReactingMixture<gasThermoPhysics>>;
inertSpecie N2;
+
fuel CH4;
chemistryReader foamChemistryReader;
@@ -26,12 +27,5 @@ foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGas";
-liquids
-{
- liquidComponents
- ();
-
- H2O H2O defaultCoeffs;
-}
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/Allclean b/tutorials/compressible/rhoCentralFoam/Allclean
index b26e6cfb8ce97c6c56bf3bbcba56063c8528402d..f630eb247a50706aafc0b97f2eecf46853c903c2 100755
--- a/tutorials/compressible/rhoCentralFoam/Allclean
+++ b/tutorials/compressible/rhoCentralFoam/Allclean
@@ -29,7 +29,6 @@ do
if [ "$caseName" = "biconic25-55Run35" ]
then
rm -rf constant/polyMesh/boundary
- wclean datToFoam
fi
)
done
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
index e1e13d8a085e290d2a3c54b8ef388df00810a895..322de821c0f33e3920f2ab3b602f4ee8580faa5f 100755
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@@ -37,7 +37,6 @@ do
;;
biconic25-55Run35)
- wmake datToFoam
runApplication datToFoam grid256.dat
CONST="constant"
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 474d11da9efe391fcf8b1fbc94915f048d7c92c6..f9185f5b54c5fdb1376db8011fbf4920ff639c17 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -72,8 +72,7 @@ relaxationFactors
{
"p.*" 0.3;
"rho.*" 1;
- "(U|h|k|epsilon|omega)" 0.7;
- "(U|h|k|epsilon|omega)Final" 1;
+ "(U|h|k|epsilon|omega).*" 0.7;
}
diff --git a/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties b/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
index d734e603cd36bd01be3e48b6359c461d2f9476bf..ed0e725fec4db0fc364dfa69159d59e6597e8933 100644
--- a/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
+++ b/tutorials/heatTransfer/buoyantBaffleSimpleFoam/circuitBoardCooling/constant/thermoBaffleProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
index 3176a9f913fed9b8666995d444d46d45acd6abec..208c5c815a5b6be8cfe2be493738c8d3d36cede2 100755
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun
@@ -29,7 +29,7 @@ done
for i in bottomAir topAir
do
- faceAgglomerate -region $i > log.faceAgglomerate.$i 2>&1
+ faceAgglomerate -region $i -dict viewFactorsDict > log.faceAgglomerate.$i 2>&1
done
for i in bottomAir topAir
diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun
index ed9f842fed766d29d015e6399fee07936b9bf0c4..474f9cfd948a0b48c12095943bc979e8efc82550 100755
--- a/tutorials/incompressible/simpleFoam/motorBike/Allrun
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allrun
@@ -7,5 +7,5 @@ cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
runApplication snappyHexMesh -overwrite
-runApplication potentialFoam -writep
+runApplication potentialFoam -noFunctionObjects -writep
runApplication `getApplication`
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index 28cd58984166daa4634bb09ed73fecfb0a49705a..3e5b2dfbd02070eef34fdc315b6f6fee207bf7db 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -20,7 +20,7 @@ startFrom latestTime;
startTime 0;
-stopAt endTime;
+stopAt nextWrite;
endTime 500;
@@ -28,7 +28,7 @@ deltaT 1;
writeControl timeStep;
-writeInterval 100;
+writeInterval 1;
purgeWrite 0;
@@ -47,6 +47,7 @@ runTimeModifiable true;
libs
(
"libOpenFOAM.so"
+ "libcompressibleTurbulenceModels.so"
"libincompressibleRASModels.so"
);
diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties
index 54ace861e3c24bcd367024a751ded80d4ab759c2..b455aa3010ef00de6515aad123f97a8a9e74c497 100644
--- a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties
+++ b/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties
@@ -17,7 +17,7 @@ FoamFile
disk1
{
- typeModel actuationDiskSource;
+ type actuationDiskSource;
active on; //on/off switch
timeStart 0.0; //start time
duration 1000.0; //duration
@@ -36,7 +36,7 @@ disk1
disk2
{
- typeModel actuationDiskSource;
+ type actuationDiskSource;
active on;
timeStart 0.0;
duration 1000.0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/H2O
deleted file mode 100644
index 5e1dccea96b5b15015ca4831ca9c52a8a04ed1ed..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/H2O
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/N2
deleted file mode 100644
index cc5c913e859e1e2568536caa3b1f8b123a5a0b4c..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/N2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/O2
deleted file mode 100644
index b0e5c52822f441ca6cf8c0ec82db91e743f3430d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/O2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/T
deleted file mode 100644
index d7e527d5cda0de78100bd0c92bbe57bf3a72a7fc..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/T
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- location "0";
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type fixedValue;
- value uniform 300;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform 300;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/U
deleted file mode 100644
index 0b165d2610ec95de4890c6543662360e2fcedd6f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/U
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p
deleted file mode 100644
index fcda0699d11a35c7a4136c508c42d5c2e5bea13d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type calculated;
- value $internalField;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type calculated;
- value $internalField;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p_rgh
deleted file mode 100644
index f9906768c18128f48fe3833b1b29985c3f9c4a11..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/p_rgh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type buoyantPressure;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type buoyantPressure;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Tf
deleted file mode 100644
index 79b48fefa26ef3cd0a6525df8682a3f613d1e844..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- filmWalls
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Uf
deleted file mode 100644
index 962a7a18fb5eaee2cf609cdd133541d54c24054a..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/wallFilmRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type slip;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- filmWalls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/deltaf
deleted file mode 100644
index 0289f0e1c89bf78f332822c80a41920ba51131a9..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0.org/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- filmWalls
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/H2O
deleted file mode 100644
index 5e1dccea96b5b15015ca4831ca9c52a8a04ed1ed..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/H2O
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/N2
deleted file mode 100644
index cc5c913e859e1e2568536caa3b1f8b123a5a0b4c..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/N2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/O2
deleted file mode 100644
index b0e5c52822f441ca6cf8c0ec82db91e743f3430d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/O2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/T
deleted file mode 100644
index d7e527d5cda0de78100bd0c92bbe57bf3a72a7fc..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/T
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- location "0";
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type fixedValue;
- value uniform 300;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform 300;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/U
deleted file mode 100644
index 0b165d2610ec95de4890c6543662360e2fcedd6f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/U
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p
deleted file mode 100644
index fcda0699d11a35c7a4136c508c42d5c2e5bea13d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type calculated;
- value $internalField;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type calculated;
- value $internalField;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p_rgh
deleted file mode 100644
index f9906768c18128f48fe3833b1b29985c3f9c4a11..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/p_rgh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type buoyantPressure;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type buoyantPressure;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Tf
deleted file mode 100644
index 79b48fefa26ef3cd0a6525df8682a3f613d1e844..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- filmWalls
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Uf
deleted file mode 100644
index 962a7a18fb5eaee2cf609cdd133541d54c24054a..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/wallFilmRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type slip;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- filmWalls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/deltaf
deleted file mode 100644
index 0289f0e1c89bf78f332822c80a41920ba51131a9..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- filmWalls
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/H2O
deleted file mode 100644
index 5e1dccea96b5b15015ca4831ca9c52a8a04ed1ed..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/H2O
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/N2
deleted file mode 100644
index cc5c913e859e1e2568536caa3b1f8b123a5a0b4c..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/N2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/O2
deleted file mode 100644
index b0e5c52822f441ca6cf8c0ec82db91e743f3430d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/O2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/T
deleted file mode 100644
index d7e527d5cda0de78100bd0c92bbe57bf3a72a7fc..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/T
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- location "0";
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type fixedValue;
- value uniform 300;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform 300;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/U
deleted file mode 100644
index 0b165d2610ec95de4890c6543662360e2fcedd6f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/U
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p
deleted file mode 100644
index fcda0699d11a35c7a4136c508c42d5c2e5bea13d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type calculated;
- value $internalField;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type calculated;
- value $internalField;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p_rgh
deleted file mode 100644
index f9906768c18128f48fe3833b1b29985c3f9c4a11..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/p_rgh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- "(sides|frontAndBack)"
- {
- type buoyantPressure;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type buoyantPressure;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Tf
deleted file mode 100644
index bc6b8e79fca8eea185b0c437f4e44fcf3f080438..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- sides
- {
- type zeroGradient;
- }
-
- frontAndBack
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Uf
deleted file mode 100644
index 14a9ce78faef9ecb14efe84c154a85d36265a987..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/wallFilmRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type slip;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- sides
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- frontAndBack
- {
- type slip;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/deltaf
deleted file mode 100644
index d4a13507583d5d14d23d2e8d6a6cd450f5431288..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- sides
- {
- type zeroGradient;
- }
-
- frontAndBack
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
index 50d71cadc33ae76ed7d264ab889a617c67f2ebda..4b9a47bd2eb31ced8fa7700bbedc0778b768a485 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allclean
@@ -1,4 +1,6 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,8 +8,6 @@ cleanCase
rm -rf constant/wallFilmRegion
rm -rf 0
-cp -rf 0.org 0
-
rm -f *.obj
-#rm -rf VTK
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
index 6904214c8d0fa6152245d851f31867cce7dcd7fa..747433b184cd7c4e4f4813cbc0ff1f43757ea9d2 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre
@@ -1,6 +1,7 @@
#!/bin/sh
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cp -rf 0.org 0
runApplication blockMesh
runApplication setSet -batch wallFilmRegion.setSet
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
index ff5a2a042023af02f0307a8181e0829606f4de85..21c1867cd8f1175b03fefb1a32af827685b8df47 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/polyMesh/boundary
@@ -17,23 +17,1132 @@ FoamFile
3
(
- filmWalls
- {
- type wall;
- nFaces 1100;
- startFace 62790;
- }
sides
{
type patch;
nFaces 1320;
- startFace 63890;
+ startFace 62790;
}
frontAndBack
{
type wall;
nFaces 4000;
- startFace 65210;
+ startFace 64110;
+ }
+ region0_to_wallFilmRegion_wallFilmFaces
+ {
+ type directMappedWall;
+ nFaces 1100;
+ startFace 68110;
+ sampleMode nearestPatchFace;
+ sampleRegion wallFilmRegion;
+ samplePatch region0_to_wallFilmRegion_wallFilmFaces;
+ offsetMode nonuniform;
+ offsets
+1100
+(
+(-1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 -2.775557562e-17)
+(-1.110223025e-16 0 2.775557562e-17)
+(0 0 0)
+(-1.110223025e-16 0 0)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 0)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -2.775557562e-17)
+(1.110223025e-16 0 -1.387778781e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 0)
+(0 0 2.775557562e-17)
+(0 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(0 0 -1.110223025e-16)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 -2.775557562e-17)
+(-2.220446049e-16 0 2.775557562e-17)
+(-1.110223025e-16 0 0)
+(-1.110223025e-16 0 0)
+(0 0 -5.551115123e-17)
+(1.110223025e-16 0 0)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 -2.775557562e-17)
+(0 0 -1.387778781e-17)
+(1.110223025e-16 0 0)
+(0 0 0)
+(1.110223025e-16 0 2.775557562e-17)
+(1.110223025e-16 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(-1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-3.330669074e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 -2.775557562e-17)
+(-1.110223025e-16 0 2.775557562e-17)
+(-2.220446049e-16 0 0)
+(-1.110223025e-16 0 0)
+(-3.330669074e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 0)
+(-1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-1.110223025e-16 0 2.775557562e-17)
+(0 0 0)
+(-1.110223025e-16 0 -1.387778781e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 0)
+(0 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-1.110223025e-16 0 0)
+(0 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(1.110223025e-16 0 -2.775557562e-17)
+(-1.110223025e-16 0 -1.387778781e-17)
+(0 0 0)
+(0 0 0)
+(0 0 2.775557562e-17)
+(3.330669074e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(-1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-3.330669074e-16 0 5.551115123e-17)
+(-3.330669074e-16 0 -2.775557562e-17)
+(-3.330669074e-16 0 2.775557562e-17)
+(-1.110223025e-16 0 0)
+(-1.110223025e-16 0 0)
+(-3.330669074e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 0)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -2.775557562e-17)
+(0 0 -1.387778781e-17)
+(1.110223025e-16 0 0)
+(0 0 0)
+(0 0 2.775557562e-17)
+(0 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 -2.775557562e-17)
+(-2.220446049e-16 0 2.775557562e-17)
+(0 0 0)
+(-1.110223025e-16 0 0)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 0)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 0)
+(-2.220446049e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 1.110223025e-16)
+(-2.220446049e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 0)
+(-2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(-2.220446049e-16 0 0)
+(-6.661338148e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(0 0 1.387778781e-17)
+(0 0 0)
+(0 0 0)
+(-6.661338148e-16 0 -8.326672685e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-4.440892099e-16 0 1.665334537e-16)
+(-4.440892099e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(2.220446049e-16 0 -1.387778781e-17)
+(2.220446049e-16 0 0)
+(0 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(-4.440892099e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 0)
+(-2.220446049e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 1.110223025e-16)
+(-4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(-2.220446049e-16 0 1.387778781e-17)
+(-2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(2.220446049e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(-2.220446049e-16 0 0)
+(-4.440892099e-16 0 -8.326672685e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 0)
+(-2.220446049e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 1.110223025e-16)
+(-6.661338148e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 0)
+(-2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(0 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 1.387778781e-17)
+(0 0 0)
+(-4.440892099e-16 0 0)
+(-4.440892099e-16 0 -8.326672685e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-2.220446049e-16 0 1.665334537e-16)
+(-6.661338148e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(-2.220446049e-16 0 -1.387778781e-17)
+(-2.220446049e-16 0 0)
+(0 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-6.661338148e-16 0 1.110223025e-16)
+(-4.440892099e-16 0 4.163336342e-17)
+(-2.220446049e-16 0 0)
+(0 0 1.387778781e-17)
+(-4.440892099e-16 0 -2.775557562e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(4.440892099e-16 0 -1.110223025e-16)
+(0 0 0)
+(-6.661338148e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(0 0 1.387778781e-17)
+(0 0 0)
+(-4.440892099e-16 0 0)
+(-6.661338148e-16 0 -8.326672685e-17)
+(0 0 5.551115123e-17)
+(4.440892099e-16 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(0 0 5.551115123e-17)
+(0 0 0)
+(-2.220446049e-16 0 5.551115123e-17)
+(-6.661338148e-16 0 1.110223025e-16)
+(-4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(-4.440892099e-16 0 0)
+(-2.220446049e-16 0 -2.775557562e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 -1.110223025e-16)
+(2.220446049e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-2.220446049e-16 0 1.387778781e-17)
+(-2.220446049e-16 0 0)
+(0 0 0)
+(-4.440892099e-16 0 -8.326672685e-17)
+(4.440892099e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-2.220446049e-16 0 1.665334537e-16)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(2.220446049e-16 0 -1.387778781e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-8.881784197e-16 0 1.110223025e-16)
+(-4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 1.387778781e-17)
+(-4.440892099e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(0 0 0)
+(-6.661338148e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 1.387778781e-17)
+(0 0 0)
+(-2.220446049e-16 0 0)
+(-6.661338148e-16 0 -8.326672685e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-4.440892099e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-8.881784197e-16 0 1.110223025e-16)
+(-6.661338148e-16 0 4.163336342e-17)
+(-4.440892099e-16 0 0)
+(-4.440892099e-16 0 0)
+(-4.440892099e-16 0 -2.775557562e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(-4.440892099e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(0 0 0)
+(-8.881784197e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(-6.661338148e-16 0 0)
+(-8.881784197e-16 0 -8.326672685e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(4.440892099e-16 0 1.110223025e-16)
+(-8.881784197e-16 0 1.665334537e-16)
+(-8.881784197e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 2.775557562e-17)
+(2.220446049e-16 0 -1.387778781e-17)
+(-2.220446049e-16 0 0)
+(2.220446049e-16 0 1.387778781e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-8.881784197e-16 0 -5.551115123e-17)
+(-8.881784197e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-6.661338148e-16 0 1.110223025e-16)
+(-4.440892099e-16 0 4.163336342e-17)
+(-2.220446049e-16 0 0)
+(0 0 1.387778781e-17)
+(-4.440892099e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(0 0 0)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(-6.661338148e-16 0 0)
+(-4.440892099e-16 0 -8.326672685e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 2.775557562e-17)
+(0 0 0)
+(3.330669074e-16 0 -1.387778781e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(0 0 0)
+(2.220446049e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -2.775557562e-17)
+(2.220446049e-16 0 -1.387778781e-17)
+(1.110223025e-16 0 0)
+(2.220446049e-16 0 0)
+(0 0 2.775557562e-17)
+(-1.110223025e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(3.330669074e-16 0 -1.110223025e-16)
+(1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(3.330669074e-16 0 5.551115123e-17)
+(3.330669074e-16 0 -2.775557562e-17)
+(1.110223025e-16 0 2.775557562e-17)
+(1.110223025e-16 0 0)
+(2.220446049e-16 0 0)
+(3.330669074e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -2.775557562e-17)
+(0 0 -1.387778781e-17)
+(2.220446049e-16 0 0)
+(0 0 0)
+(0 0 2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(1.110223025e-16 0 2.775557562e-17)
+(0 0 0)
+(0 0 0)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(3.330669074e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(1.110223025e-16 0 2.775557562e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 -1.387778781e-17)
+(3.330669074e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 -2.775557562e-17)
+(1.110223025e-16 0 -1.387778781e-17)
+(0 0 0)
+(1.110223025e-16 0 0)
+(-1.110223025e-16 0 2.775557562e-17)
+(-1.110223025e-16 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(1.110223025e-16 0 -1.110223025e-16)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 -2.775557562e-17)
+(1.110223025e-16 0 2.775557562e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 0)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -2.775557562e-17)
+(0 0 -1.387778781e-17)
+(2.220446049e-16 0 0)
+(0 0 0)
+(0 0 2.775557562e-17)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(1.110223025e-16 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(1.110223025e-16 0 2.775557562e-17)
+(0 0 0)
+(1.110223025e-16 0 0)
+(2.220446049e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 0)
+(1.110223025e-16 0 -5.551115123e-17)
+(1.110223025e-16 0 5.551115123e-17)
+(6.661338148e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.110223025e-16)
+(4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(6.661338148e-16 0 0)
+(2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(6.661338148e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 0)
+(8.881784197e-16 0 5.551115123e-17)
+(6.661338148e-16 0 5.551115123e-17)
+(2.220446049e-16 0 1.387778781e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 0)
+(8.881784197e-16 0 -8.326672685e-17)
+(0 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.110223025e-16)
+(2.220446049e-16 0 1.665334537e-16)
+(6.661338148e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(0 0 -1.387778781e-17)
+(-4.440892099e-16 0 0)
+(0 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(6.661338148e-16 0 -1.110223025e-16)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.110223025e-16)
+(2.220446049e-16 0 4.163336342e-17)
+(0 0 0)
+(4.440892099e-16 0 1.387778781e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(0 0 0)
+(8.881784197e-16 0 5.551115123e-17)
+(4.440892099e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.387778781e-17)
+(4.440892099e-16 0 0)
+(0 0 0)
+(8.881784197e-16 0 -8.326672685e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(4.440892099e-16 0 5.551115123e-17)
+(4.440892099e-16 0 0)
+(2.220446049e-16 0 5.551115123e-17)
+(6.661338148e-16 0 1.110223025e-16)
+(8.881784197e-16 0 4.163336342e-17)
+(4.440892099e-16 0 0)
+(0 0 0)
+(2.220446049e-16 0 -2.775557562e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(0 0 0)
+(4.440892099e-16 0 -8.326672685e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.110223025e-16)
+(4.440892099e-16 0 1.665334537e-16)
+(4.440892099e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(-2.220446049e-16 0 -1.387778781e-17)
+(0 0 0)
+(-2.220446049e-16 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(4.440892099e-16 0 -1.110223025e-16)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(6.661338148e-16 0 1.110223025e-16)
+(8.881784197e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 1.387778781e-17)
+(4.440892099e-16 0 -2.775557562e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(0 0 0)
+(6.661338148e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.387778781e-17)
+(0 0 0)
+(2.220446049e-16 0 0)
+(6.661338148e-16 0 -8.326672685e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.110223025e-16)
+(0 0 5.551115123e-17)
+(4.440892099e-16 0 0)
+(0 0 5.551115123e-17)
+(6.661338148e-16 0 1.110223025e-16)
+(4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 0)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-4.440892099e-16 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(2.220446049e-16 0 0)
+(4.440892099e-16 0 -8.326672685e-17)
+(-4.440892099e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-4.440892099e-16 0 1.110223025e-16)
+(2.220446049e-16 0 1.665334537e-16)
+(6.661338148e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 2.775557562e-17)
+(-2.220446049e-16 0 -1.387778781e-17)
+(-2.220446049e-16 0 0)
+(0 0 1.387778781e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -1.110223025e-16)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 0)
+(0 0 5.551115123e-17)
+(2.220446049e-16 0 1.110223025e-16)
+(4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(-2.220446049e-16 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(0 0 -1.110223025e-16)
+(-2.220446049e-16 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.387778781e-17)
+(0 0 0)
+(0 0 0)
+(4.440892099e-16 0 -8.326672685e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-2.220446049e-16 0 1.110223025e-16)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 0)
+(2.220446049e-16 0 5.551115123e-17)
+(6.661338148e-16 0 1.110223025e-16)
+(4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(2.220446049e-16 0 0)
+(2.220446049e-16 0 -2.775557562e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(-2.220446049e-16 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(2.220446049e-16 0 1.387778781e-17)
+(0 0 0)
+(4.440892099e-16 0 0)
+(4.440892099e-16 0 -8.326672685e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 1.110223025e-16)
+(4.440892099e-16 0 1.665334537e-16)
+(4.440892099e-16 0 5.551115123e-17)
+(0 0 0)
+(0 0 2.775557562e-17)
+(0 0 -1.387778781e-17)
+(0 0 0)
+(0 0 1.387778781e-17)
+(0 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(4.440892099e-16 0 -5.551115123e-17)
+(4.440892099e-16 0 -1.110223025e-16)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 0)
+(2.220446049e-16 0 5.551115123e-17)
+(4.440892099e-16 0 1.110223025e-16)
+(4.440892099e-16 0 4.163336342e-17)
+(0 0 0)
+(0 0 1.387778781e-17)
+(2.220446049e-16 0 -2.775557562e-17)
+(0 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(2.220446049e-16 0 -5.551115123e-17)
+(-2.220446049e-16 0 -1.110223025e-16)
+(0 0 0)
+(4.440892099e-16 0 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 0 1.387778781e-17)
+(0 0 0)
+(0 0 0)
+(4.440892099e-16 0 -8.326672685e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(-2.220446049e-16 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-5.551115123e-17 1.110223025e-16 0)
+(-5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 0 -1.110223025e-16)
+(-5.551115123e-17 -2.775557562e-16 1.665334537e-16)
+(0 5.551115123e-17 1.665334537e-16)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(0 5.551115123e-17 5.551115123e-17)
+(0 1.110223025e-16 5.551115123e-17)
+(0 -5.551115123e-17 0)
+(3.469446952e-18 -1.110223025e-16 0)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 0)
+(-5.551115123e-17 -2.775557562e-16 1.110223025e-16)
+(0 5.551115123e-17 0)
+(-2.775557562e-17 0 -5.551115123e-17)
+(0 5.551115123e-17 0)
+(-1.387778781e-17 -5.551115123e-17 1.110223025e-16)
+(0 -5.551115123e-17 5.551115123e-17)
+(3.469446952e-18 -1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 0 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 0)
+(-2.775557562e-17 5.551115123e-17 0)
+(-2.775557562e-17 -1.110223025e-16 5.551115123e-17)
+(-2.775557562e-17 -1.110223025e-16 5.551115123e-17)
+(0 -5.551115123e-17 5.551115123e-17)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(0 -5.551115123e-17 0)
+(-6.938893904e-18 -1.110223025e-16 5.551115123e-17)
+(-5.551115123e-17 -1.110223025e-16 5.551115123e-17)
+(-5.551115123e-17 0 2.775557562e-17)
+(0 -5.551115123e-17 0)
+(-5.551115123e-17 -5.551115123e-17 8.326672685e-17)
+(0 0 2.775557562e-17)
+(0 0 0)
+(0 -5.551115123e-17 0)
+(0 5.551115123e-17 -2.775557562e-17)
+(0 5.551115123e-17 2.775557562e-17)
+(-6.938893904e-18 -5.551115123e-17 5.551115123e-17)
+(-1.110223025e-16 -1.110223025e-16 1.387778781e-17)
+(-5.551115123e-17 0 1.387778781e-17)
+(1.110223025e-16 1.110223025e-16 -1.387778781e-17)
+(-2.775557562e-17 5.551115123e-17 1.387778781e-17)
+(-2.775557562e-17 -1.110223025e-16 0)
+(-2.775557562e-17 5.551115123e-17 0)
+(-5.551115123e-17 -1.665334537e-16 4.163336342e-17)
+(-1.387778781e-17 -1.110223025e-16 0)
+(6.938893904e-18 0 -1.387778781e-17)
+(-3.469446952e-18 -1.110223025e-16 4.163336342e-17)
+(-5.551115123e-17 -5.551115123e-17 0)
+(-5.551115123e-17 -5.551115123e-17 0)
+(0 0 0)
+(-2.775557562e-17 0 0)
+(5.551115123e-17 0 0)
+(0 5.551115123e-17 0)
+(0 5.551115123e-17 0)
+(-1.387778781e-17 5.551115123e-17 0)
+(0 -5.551115123e-17 0)
+(-3.469446952e-18 -5.551115123e-17 0)
+(0 -1.110223025e-16 1.387778781e-17)
+(-1.110223025e-16 0 -1.387778781e-17)
+(5.551115123e-17 5.551115123e-17 0)
+(0 -5.551115123e-17 -1.387778781e-17)
+(0 -5.551115123e-17 0)
+(-1.387778781e-16 -1.665334537e-16 -4.163336342e-17)
+(-5.551115123e-17 0 -1.387778781e-17)
+(1.387778781e-17 -1.665334537e-16 1.387778781e-17)
+(6.938893904e-18 5.551115123e-17 1.387778781e-17)
+(-3.469446952e-18 5.551115123e-17 -4.163336342e-17)
+(5.551115123e-17 0 0)
+(-1.110223025e-16 0 -2.775557562e-17)
+(5.551115123e-17 0 2.775557562e-17)
+(-2.775557562e-17 5.551115123e-17 -5.551115123e-17)
+(-2.775557562e-17 0 -5.551115123e-17)
+(-2.775557562e-17 -1.665334537e-16 -5.551115123e-17)
+(0 -5.551115123e-17 0)
+(-1.387778781e-17 0 0)
+(0 -5.551115123e-17 -2.775557562e-17)
+(-6.938893904e-18 -1.110223025e-16 -8.326672685e-17)
+(-5.551115123e-17 -1.110223025e-16 -5.551115123e-17)
+(-5.551115123e-17 0 -5.551115123e-17)
+(0 -5.551115123e-17 0)
+(-5.551115123e-17 -5.551115123e-17 -1.110223025e-16)
+(0 0 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 -5.551115123e-17 -5.551115123e-17)
+(0 5.551115123e-17 5.551115123e-17)
+(0 5.551115123e-17 0)
+(-6.938893904e-18 -5.551115123e-17 5.551115123e-17)
+(-5.551115123e-17 1.110223025e-16 5.551115123e-17)
+(-5.551115123e-17 5.551115123e-17 -5.551115123e-17)
+(5.551115123e-17 0 0)
+(-1.110223025e-16 -2.775557562e-16 -1.110223025e-16)
+(0 5.551115123e-17 -5.551115123e-17)
+(-2.775557562e-17 0 -1.110223025e-16)
+(0 5.551115123e-17 0)
+(0 1.110223025e-16 -5.551115123e-17)
+(0 -5.551115123e-17 0)
+(3.469446952e-18 -1.110223025e-16 5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(0 5.551115123e-17 -5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 0)
+(-5.551115123e-17 -2.775557562e-16 -1.665334537e-16)
+(0 5.551115123e-17 -5.551115123e-17)
+(-2.775557562e-17 0 0)
+(0 5.551115123e-17 -1.110223025e-16)
+(-1.387778781e-17 -5.551115123e-17 -5.551115123e-17)
+(0 -5.551115123e-17 0)
+(3.469446952e-18 -1.110223025e-16 -1.110223025e-16)
+(-1.110223025e-16 3.469446952e-18 0)
+(-1.110223025e-16 0 0)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-1.110223025e-16 -5.551115123e-17 2.220446049e-16)
+(5.551115123e-17 2.775557562e-17 1.665334537e-16)
+(-1.665334537e-16 -1.110223025e-16 1.665334537e-16)
+(0 5.551115123e-17 5.551115123e-17)
+(0 -1.665334537e-16 1.665334537e-16)
+(0 0 5.551115123e-17)
+(0 3.469446952e-18 -5.551115123e-17)
+(-1.110223025e-16 0 5.551115123e-17)
+(0 0 1.110223025e-16)
+(-1.110223025e-16 0 0)
+(0 -2.775557562e-17 5.551115123e-17)
+(0 0 0)
+(-1.665334537e-16 -1.110223025e-16 1.110223025e-16)
+(-5.551115123e-17 5.551115123e-17 0)
+(0 -1.665334537e-16 1.110223025e-16)
+(-5.551115123e-17 0 1.110223025e-16)
+(-1.665334537e-16 0 5.551115123e-17)
+(5.551115123e-17 -6.938893904e-18 0)
+(-5.551115123e-17 -2.775557562e-17 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(-1.665334537e-16 -8.326672685e-17 5.551115123e-17)
+(-5.551115123e-17 -5.551115123e-17 5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 0)
+(-5.551115123e-17 0 5.551115123e-17)
+(0 5.551115123e-17 -5.551115123e-17)
+(-1.110223025e-16 3.469446952e-18 5.551115123e-17)
+(2.220446049e-16 0 0)
+(0 -1.387778781e-17 0)
+(0 0 0)
+(1.110223025e-16 2.775557562e-17 -2.775557562e-17)
+(-1.110223025e-16 -2.775557562e-17 2.775557562e-17)
+(-5.551115123e-17 -8.326672685e-17 8.326672685e-17)
+(0 -5.551115123e-17 2.775557562e-17)
+(-5.551115123e-17 -5.551115123e-17 0)
+(-1.110223025e-16 -5.551115123e-17 5.551115123e-17)
+(-1.110223025e-16 -3.469446952e-18 4.163336342e-17)
+(0 -6.938893904e-18 1.387778781e-17)
+(-5.551115123e-17 1.387778781e-17 1.387778781e-17)
+(-1.665334537e-16 -2.775557562e-17 4.163336342e-17)
+(0 0 0)
+(-1.110223025e-16 -2.775557562e-17 0)
+(-1.110223025e-16 -1.110223025e-16 2.775557562e-17)
+(5.551115123e-17 -5.551115123e-17 1.387778781e-17)
+(0 -5.551115123e-17 2.775557562e-17)
+(-5.551115123e-17 0 0)
+(-5.551115123e-17 -3.469446952e-18 0)
+(1.665334537e-16 0 0)
+(-1.110223025e-16 -1.387778781e-17 0)
+(5.551115123e-17 0 0)
+(0 0 0)
+(0 -2.775557562e-17 0)
+(-1.665334537e-16 -8.326672685e-17 0)
+(5.551115123e-17 0 0)
+(-5.551115123e-17 -5.551115123e-17 0)
+(-5.551115123e-17 -1.110223025e-16 0)
+(-1.110223025e-16 -3.469446952e-18 -4.163336342e-17)
+(0 -6.938893904e-18 0)
+(-5.551115123e-17 1.387778781e-17 1.387778781e-17)
+(-1.110223025e-16 0 -1.387778781e-17)
+(0 0 0)
+(-5.551115123e-17 2.775557562e-17 0)
+(5.551115123e-17 -2.775557562e-17 -1.387778781e-17)
+(0 5.551115123e-17 -1.387778781e-17)
+(0 -1.110223025e-16 -2.775557562e-17)
+(5.551115123e-17 5.551115123e-17 2.775557562e-17)
+(-1.665334537e-16 0 -8.326672685e-17)
+(5.551115123e-17 -6.938893904e-18 -2.775557562e-17)
+(-5.551115123e-17 -2.775557562e-17 -2.775557562e-17)
+(0 0 0)
+(5.551115123e-17 0 -2.775557562e-17)
+(-1.665334537e-16 -2.775557562e-17 -5.551115123e-17)
+(-5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(0 0 -2.775557562e-17)
+(-5.551115123e-17 0 -5.551115123e-17)
+(0 5.551115123e-17 0)
+(-1.110223025e-16 3.469446952e-18 5.551115123e-17)
+(2.220446049e-16 0 5.551115123e-17)
+(0 -1.387778781e-17 0)
+(0 0 -5.551115123e-17)
+(1.110223025e-16 2.775557562e-17 0)
+(-1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(-5.551115123e-17 -8.326672685e-17 -1.110223025e-16)
+(0 -5.551115123e-17 -5.551115123e-17)
+(-5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(-1.110223025e-16 -5.551115123e-17 -5.551115123e-17)
+(0 0 5.551115123e-17)
+(-1.110223025e-16 0 0)
+(0 0 5.551115123e-17)
+(0 0 0)
+(-1.110223025e-16 -5.551115123e-17 -1.665334537e-16)
+(0 2.775557562e-17 -5.551115123e-17)
+(-1.665334537e-16 -1.110223025e-16 -1.110223025e-16)
+(0 5.551115123e-17 0)
+(0 -1.665334537e-16 -1.110223025e-16)
+(0 0 -5.551115123e-17)
+(0 3.469446952e-18 -1.110223025e-16)
+(-1.110223025e-16 0 0)
+(0 0 -5.551115123e-17)
+(-1.110223025e-16 0 -1.110223025e-16)
+(0 -2.775557562e-17 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(-1.665334537e-16 -1.110223025e-16 -1.665334537e-16)
+(-5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(0 -1.665334537e-16 -1.665334537e-16)
+(-5.551115123e-17 0 5.551115123e-17)
+(0 1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 5.551115123e-17)
+(0 0 0)
+(5.551115123e-17 0 0)
+(0 -5.551115123e-17 -1.110223025e-16)
+(2.775557562e-17 0 -5.551115123e-17)
+(0 -1.110223025e-16 5.551115123e-17)
+(1.387778781e-17 -5.551115123e-17 0)
+(0 -5.551115123e-17 0)
+(-3.469446952e-18 1.110223025e-16 0)
+(0 1.110223025e-16 0)
+(5.551115123e-17 -5.551115123e-17 5.551115123e-17)
+(0 0 0)
+(5.551115123e-17 0 -5.551115123e-17)
+(-2.775557562e-17 -5.551115123e-17 5.551115123e-17)
+(2.775557562e-17 0 1.110223025e-16)
+(0 0 0)
+(0 0 0)
+(-1.387778781e-17 5.551115123e-17 -1.110223025e-16)
+(0 1.110223025e-16 0)
+(5.551115123e-17 -1.110223025e-16 1.110223025e-16)
+(5.551115123e-17 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(8.326672685e-17 -1.665334537e-16 5.551115123e-17)
+(2.775557562e-17 -1.110223025e-16 5.551115123e-17)
+(-2.775557562e-17 5.551115123e-17 0)
+(0 0 5.551115123e-17)
+(1.387778781e-17 0 0)
+(0 1.665334537e-16 0)
+(3.469446952e-18 -5.551115123e-17 0)
+(-5.551115123e-17 0 0)
+(5.551115123e-17 0 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 2.775557562e-17)
+(8.326672685e-17 -1.665334537e-16 5.551115123e-17)
+(2.775557562e-17 -1.665334537e-16 0)
+(-2.775557562e-17 1.110223025e-16 -2.775557562e-17)
+(0 0 0)
+(2.775557562e-17 -5.551115123e-17 2.775557562e-17)
+(0 5.551115123e-17 2.775557562e-17)
+(3.469446952e-18 -5.551115123e-17 2.775557562e-17)
+(-5.551115123e-17 1.665334537e-16 -2.775557562e-17)
+(1.110223025e-16 1.110223025e-16 1.387778781e-17)
+(-5.551115123e-17 5.551115123e-17 0)
+(2.775557562e-17 5.551115123e-17 1.387778781e-17)
+(-2.775557562e-17 -5.551115123e-17 0)
+(2.775557562e-17 -1.110223025e-16 2.775557562e-17)
+(2.775557562e-17 0 1.387778781e-17)
+(1.387778781e-17 0 0)
+(6.938893904e-18 0 0)
+(3.469446952e-18 -1.110223025e-16 4.163336342e-17)
+(5.551115123e-17 0 0)
+(5.551115123e-17 -5.551115123e-17 0)
+(0 0 0)
+(2.775557562e-17 0 0)
+(2.775557562e-17 0 0)
+(0 -1.110223025e-16 0)
+(0 5.551115123e-17 0)
+(1.387778781e-17 -1.110223025e-16 0)
+(0 5.551115123e-17 0)
+(6.938893904e-18 -5.551115123e-17 0)
+(1.110223025e-16 -1.110223025e-16 -2.775557562e-17)
+(0 1.110223025e-16 -2.775557562e-17)
+(-5.551115123e-17 1.665334537e-16 1.387778781e-17)
+(5.551115123e-17 -1.110223025e-16 -2.775557562e-17)
+(0 -5.551115123e-17 0)
+(-5.551115123e-17 1.110223025e-16 1.387778781e-17)
+(2.775557562e-17 -1.665334537e-16 -2.775557562e-17)
+(1.387778781e-17 0 0)
+(6.938893904e-18 -5.551115123e-17 -1.387778781e-17)
+(0 -1.110223025e-16 -4.163336342e-17)
+(5.551115123e-17 -1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 0 -2.775557562e-17)
+(0 0 -2.775557562e-17)
+(8.326672685e-17 -1.665334537e-16 -8.326672685e-17)
+(2.775557562e-17 -1.110223025e-16 0)
+(-2.775557562e-17 5.551115123e-17 2.775557562e-17)
+(0 0 0)
+(1.387778781e-17 0 0)
+(0 1.665334537e-16 -2.775557562e-17)
+(3.469446952e-18 -5.551115123e-17 0)
+(-1.110223025e-16 1.110223025e-16 1.110223025e-16)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(0 0 0)
+(8.326672685e-17 -1.665334537e-16 0)
+(8.326672685e-17 -1.665334537e-16 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(0 0 -5.551115123e-17)
+(2.775557562e-17 -5.551115123e-17 -5.551115123e-17)
+(0 -5.551115123e-17 -5.551115123e-17)
+(-3.469446952e-18 -5.551115123e-17 -5.551115123e-17)
+(0 1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 -5.551115123e-17)
+(0 0 0)
+(5.551115123e-17 0 5.551115123e-17)
+(0 -5.551115123e-17 -5.551115123e-17)
+(2.775557562e-17 0 5.551115123e-17)
+(0 -1.110223025e-16 0)
+(1.387778781e-17 -5.551115123e-17 -5.551115123e-17)
+(0 -5.551115123e-17 -5.551115123e-17)
+(-3.469446952e-18 1.110223025e-16 5.551115123e-17)
+(0 1.110223025e-16 -5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 -5.551115123e-17)
+(0 0 0)
+(8.326672685e-17 0 0)
+(0 0 -5.551115123e-17)
+(2.775557562e-17 -1.110223025e-16 -1.110223025e-16)
+(0 0 -5.551115123e-17)
+(0 0 0)
+(0 -5.551115123e-17 0)
+(-3.469446952e-18 1.110223025e-16 0)
+(0 3.469446952e-18 0)
+(0 0 0)
+(5.551115123e-17 -1.387778781e-17 5.551115123e-17)
+(-5.551115123e-17 0 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 1.110223025e-16)
+(0 0 -1.110223025e-16)
+(1.665334537e-16 0 5.551115123e-17)
+(5.551115123e-17 5.551115123e-17 0)
+(5.551115123e-17 0 5.551115123e-17)
+(1.110223025e-16 -5.551115123e-17 1.110223025e-16)
+(1.110223025e-16 0 0)
+(-1.110223025e-16 1.387778781e-17 -1.110223025e-16)
+(0 0 1.110223025e-16)
+(-5.551115123e-17 0 0)
+(5.551115123e-17 -5.551115123e-17 1.110223025e-16)
+(-5.551115123e-17 0 5.551115123e-17)
+(1.665334537e-16 -8.326672685e-17 0)
+(0 5.551115123e-17 5.551115123e-17)
+(-5.551115123e-17 0 5.551115123e-17)
+(5.551115123e-17 -5.551115123e-17 0)
+(-5.551115123e-17 -6.938893904e-18 0)
+(-5.551115123e-17 -6.938893904e-18 0)
+(-5.551115123e-17 0 -5.551115123e-17)
+(5.551115123e-17 2.775557562e-17 5.551115123e-17)
+(0 0 5.551115123e-17)
+(0 0 5.551115123e-17)
+(1.110223025e-16 -5.551115123e-17 1.110223025e-16)
+(5.551115123e-17 0 5.551115123e-17)
+(5.551115123e-17 0 0)
+(0 0 0)
+(-5.551115123e-17 -6.938893904e-18 2.775557562e-17)
+(-5.551115123e-17 -6.938893904e-18 2.775557562e-17)
+(0 -1.387778781e-17 0)
+(5.551115123e-17 2.775557562e-17 0)
+(1.110223025e-16 0 0)
+(0 -2.775557562e-17 0)
+(1.110223025e-16 -5.551115123e-17 8.326672685e-17)
+(5.551115123e-17 0 0)
+(5.551115123e-17 -1.110223025e-16 8.326672685e-17)
+(0 0 0)
+(0 -3.469446952e-18 4.163336342e-17)
+(-5.551115123e-17 -6.938893904e-18 0)
+(5.551115123e-17 1.387778781e-17 0)
+(0 -5.551115123e-17 1.387778781e-17)
+(1.110223025e-16 -8.326672685e-17 2.775557562e-17)
+(5.551115123e-17 0 0)
+(5.551115123e-17 -2.775557562e-17 2.775557562e-17)
+(-5.551115123e-17 5.551115123e-17 0)
+(0 -1.110223025e-16 1.387778781e-17)
+(5.551115123e-17 5.551115123e-17 -2.775557562e-17)
+(5.551115123e-17 -3.469446952e-18 0)
+(5.551115123e-17 0 0)
+(-5.551115123e-17 -1.387778781e-17 0)
+(-5.551115123e-17 0 0)
+(0 0 0)
+(0 5.551115123e-17 0)
+(0 -2.775557562e-17 0)
+(5.551115123e-17 0 0)
+(5.551115123e-17 0 0)
+(5.551115123e-17 -1.110223025e-16 0)
+(1.110223025e-16 -3.469446952e-18 -4.163336342e-17)
+(-5.551115123e-17 -6.938893904e-18 1.387778781e-17)
+(5.551115123e-17 1.387778781e-17 0)
+(1.665334537e-16 -2.775557562e-17 -2.775557562e-17)
+(1.110223025e-16 -8.326672685e-17 -2.775557562e-17)
+(5.551115123e-17 0 0)
+(5.551115123e-17 -2.775557562e-17 -2.775557562e-17)
+(-1.110223025e-16 5.551115123e-17 1.387778781e-17)
+(1.110223025e-16 -5.551115123e-17 -2.775557562e-17)
+(2.220446049e-16 -1.110223025e-16 -2.775557562e-17)
+(-5.551115123e-17 -6.938893904e-18 0)
+(-5.551115123e-17 -6.938893904e-18 0)
+(-5.551115123e-17 0 2.775557562e-17)
+(5.551115123e-17 2.775557562e-17 0)
+(0 0 0)
+(0 0 0)
+(1.110223025e-16 -5.551115123e-17 -8.326672685e-17)
+(5.551115123e-17 0 0)
+(5.551115123e-17 0 0)
+(0 0 0)
+(-5.551115123e-17 -6.938893904e-18 -5.551115123e-17)
+(-5.551115123e-17 0 -5.551115123e-17)
+(5.551115123e-17 -2.775557562e-17 -5.551115123e-17)
+(5.551115123e-17 0 -5.551115123e-17)
+(1.665334537e-16 -2.775557562e-17 -5.551115123e-17)
+(1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(1.110223025e-16 -2.775557562e-17 -5.551115123e-17)
+(0 5.551115123e-17 0)
+(0 -1.110223025e-16 -5.551115123e-17)
+(-1.110223025e-16 5.551115123e-17 1.110223025e-16)
+(0 3.469446952e-18 5.551115123e-17)
+(0 0 -5.551115123e-17)
+(5.551115123e-17 -1.387778781e-17 -1.110223025e-16)
+(-5.551115123e-17 0 0)
+(5.551115123e-17 -5.551115123e-17 0)
+(0 0 -5.551115123e-17)
+(1.665334537e-16 0 0)
+(5.551115123e-17 5.551115123e-17 -5.551115123e-17)
+(5.551115123e-17 0 -5.551115123e-17)
+(1.110223025e-16 -5.551115123e-17 -5.551115123e-17)
+(0 3.469446952e-18 0)
+(0 0 0)
+(0 0 -5.551115123e-17)
+(-5.551115123e-17 0 -5.551115123e-17)
+(1.110223025e-16 -2.775557562e-17 -1.110223025e-16)
+(-5.551115123e-17 2.775557562e-17 -5.551115123e-17)
+(1.665334537e-16 0 -5.551115123e-17)
+(0 5.551115123e-17 1.110223025e-16)
+(-5.551115123e-17 0 -5.551115123e-17)
+(1.665334537e-16 -5.551115123e-17 -1.110223025e-16)
+)
+;
}
)
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/H2O
deleted file mode 100644
index ae297f8760a94effed15ce5d12222ab28701b797..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/H2O
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- walls
- {
- type zeroGradient;
- }
- wallFilm
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/N2
deleted file mode 100644
index 70fe2f4443a0ba6e9ab8384ddcab1df7ab5e6640..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/N2
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- walls
- {
- type zeroGradient;
- }
- wallFilm
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/O2
deleted file mode 100644
index 1e36c78e3ab8e7d8ace7fc37277a2547457b33f9..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/O2
+++ /dev/null
@@ -1,35 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- walls
- {
- type zeroGradient;
- }
- wallFilm
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T
deleted file mode 100644
index e4dcf83f54fc4b8bc54dda0b211e6bef016a13d4..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- walls
- {
- type fixedValue;
- value uniform 300;
- }
- wallFilm
- {
- type zeroGradient;
-// type directMapped;
-// fieldName Tsf;
-// average 300;
-// setAverage no;
-// value uniform 300;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U
deleted file mode 100644
index e23dfea326276f11d8ba41c72c3f0de687740868..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- walls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
- wallFilm
- {
- type fixedValue;
- value uniform (0 0 0);
-// type directMapped;
-// fieldName Usf;
-// average (0 0 0);
-// setAverage no;
-// value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/alphat b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/alphat
deleted file mode 100644
index 46a4380474f844c1d5eff065268732c9c0445474..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/alphat
+++ /dev/null
@@ -1,43 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object alphat;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -1 0 0 0 0];
-
-internalField uniform 1e-7;
-
-boundaryField
-{
- walls
- {
- type alphatWallFunction;
- Prt 0.85;
- value uniform 0;
- }
- wallFilm
- {
- type alphatFilmWallFunction;
- B 5.5;
- yPlusCrit 11.05;
- Cmu 0.09;
- kappa 0.41;
- Prt 0.85;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/epsilon b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/epsilon
deleted file mode 100644
index 719586640579438c21352e7d50ed9dd05d16db7d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/epsilon
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -3 0 0 0 0];
-
-internalField uniform 1e-7;
-
-boundaryField
-{
- walls
- {
- type compressible::epsilonWallFunction;
- value uniform 1e-7;
- }
- wallFilm
- {
- type compressible::epsilonWallFunction;
- value uniform 1e-7;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/htcConv b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/htcConv
deleted file mode 100644
index f4cbc1b0b18316b03123ee6dc38eca4075d9376b..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/htcConv
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object htcConv;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 0 -1 1 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- walls
- {
- type calculated;
- value uniform 0;
- }
- wallFilm
- {
- type htcConvection;
- L 1.0;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/k b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/k
deleted file mode 100644
index bc0653feeac5f4099527946b15730a59674dc5dd..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/k
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0 0 0];
-
-internalField uniform 1e-5;
-
-boundaryField
-{
- walls
- {
- type compressible::kqRWallFunction;
- value uniform 1e-5;
- }
- wallFilm
- {
- type compressible::kqRWallFunction;
- value uniform 1e-5;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/mut b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/mut
deleted file mode 100644
index fef72d695479376bddba0a53f67763d82b4b7366..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/mut
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object mut;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -1 0 0 0 0];
-
-internalField uniform 1e-7;
-
-boundaryField
-{
- walls
- {
- type mutkWallFunction;
- value uniform 0;
- }
- wallFilm
- {
- type mutkFilmWallFunction;
- B 5.5;
- yPlusCrit 11.05;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p
deleted file mode 100644
index 333c21b8f801433711e8ce507ee4f984f5c16a7a..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- walls
- {
- type calculated;
- value $internalField;
- }
- wallFilm
- {
- type calculated;
- value $internalField;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p_rgh
deleted file mode 100644
index 627d7baca275d72ba0bc9feb3d6f6af8d529c6e2..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/p_rgh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- walls
- {
- type buoyantPressure;
- value uniform 100000;
- }
- wallFilm
- {
- type buoyantPressure;
- value uniform 100000;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Tf
deleted file mode 100644
index dee03cc908a495827531a87fd135f692320ab2b2..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/region0_to_"(region0_to.*)"Region_masterRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- // cyclic boundaries between film patches
- "(cube[0-9][0-9]_side[0-9]_to_cube[0-9][0-9]_side[0-9])"
- {
- type nonuniformTransformCyclic;
- }
-
- // top film surface
- "(.*top)"
- {
- type zeroGradient;
- }
-
- // mapped boundaries
- "(region0_to.*)"
- {
-// type zeroGradient;
- type fixedValue;
- value uniform 350.0;
- }
-
- // floor sides
- walls
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Uf
deleted file mode 100644
index d62d022434dbcc297303a55a0aaba7e411fe36df..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/region0_to_"(region0_to.*)"Region_masterRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- // cyclic boundaries between film patches
- "(cube[0-9][0-9]_side[0-9]_to_cube[0-9][0-9]_side[0-9])"
- {
- type nonuniformTransformCyclic;
- }
-
- // top film surface
- "(.*top)"
- {
- type slip;
- }
-
- // mapped boundaries
- "(region0_to.*)"
- {
- type slip;
- }
-
- // floor sides
- walls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/deltaf
deleted file mode 100644
index 1b030261ba5b7efa39452378f32469c87969cdb5..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/region0_to_"(region0_to.*)"Region_masterRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- // cyclic boundaries between film patches
- "(cube[0-9][0-9]_side[0-9]_to_cube[0-9][0-9]_side[0-9])"
- {
- type nonuniformTransformCyclic;
- }
-
- // top film surface
- "(.*top)"
- {
- type zeroGradient;
- }
-
- // mapped boundaries
- "(region0_to.*)"
- {
- type zeroGradient;
- }
-
- // floor sides
- walls
- {
- type zeroGradient;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
index 306d060536d045a42cc6f8670598d53cf4daadcf..f911c216cc4ea926d7f4244317551c3eb0202025 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allclean
@@ -9,7 +9,6 @@ cleanCase
rm -rf system/wallFilmRegion
rm -rf constant/wallFilmRegion
rm -rf 0
-cp -rf 0.org 0
-
rm -f *.obj
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
index e06272a5dca406ac16dab8ba0c94f91bedfe04a0..55834022011a73d1e1e9d86dbc86df1e234db9e7 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cp -rf 0.org 0
+
# create the underlying block mesh
runApplication blockMesh
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/H2O
deleted file mode 100644
index 2d90f452cd1bebbd3d1f54a66f46272b13111a5f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/H2O
+++ /dev/null
@@ -1,44 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- inlet
- {
- type zeroGradient;
- }
- outlet
- {
- type zeroGradient;
- }
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/N2
deleted file mode 100644
index 3d8a7b367e12464e6fc5ed6cbb7580c5ebebb803..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/N2
+++ /dev/null
@@ -1,44 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- inlet
- {
- type zeroGradient;
- }
- outlet
- {
- type zeroGradient;
- }
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/O2
deleted file mode 100644
index deb3fe0815e28543831d13a206ce6f1ee9405804..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/O2
+++ /dev/null
@@ -1,44 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- inlet
- {
- type zeroGradient;
- }
- outlet
- {
- type zeroGradient;
- }
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/T
deleted file mode 100644
index 7e13456ed51e0026b50d498b5741e74808d7183d..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/T
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- location "0";
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- inlet
- {
- type fixedValue;
- value uniform 300;
- }
- outlet
- {
- type fixedValue;
- value uniform 300;
- }
- sides
- {
- type fixedValue;
- value uniform 300;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform 300;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/U
deleted file mode 100644
index 7ddcf319b9fce711d54b4fd65edd64b9b50d7454..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/U
+++ /dev/null
@@ -1,47 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- inlet
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- outlet
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- sides
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p
deleted file mode 100644
index cdb7e3e085e91ba5d0a1e90599bdebbacdf190ba..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- inlet
- {
- type calculated;
- value $internalField;
- }
- outlet
- {
- type calculated;
- value $internalField;
- }
- sides
- {
- type calculated;
- value $internalField;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type calculated;
- value $internalField;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p_rgh
deleted file mode 100644
index 8f8978aedcc1c34e0537d3f19805fcec5ccac035..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/p_rgh
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- inlet
- {
- type buoyantPressure;
- }
- outlet
- {
- type buoyantPressure;
- }
- sides
- {
- type buoyantPressure;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type buoyantPressure;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Tf
deleted file mode 100644
index a18851705b3ad4146c1ada22175c17066d3d341a..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- inlet
- {
- type fixedValue;
- value uniform 300;
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- sides
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Uf
deleted file mode 100644
index 4645c1211ceb534e7277550e88374cba5d140f3f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/wallFilmRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type slip;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- inlet
- {
- type fixedValue;
- value uniform (0 -0.075 0);
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- sides
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/deltaf
deleted file mode 100644
index 3f9de4d2bcf0213e86abe13a624df06dea2ee44c..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- inlet
- {
- type fixedValue;
- value uniform 1e-3;
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- sides
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
index 50d71cadc33ae76ed7d264ab889a617c67f2ebda..4b9a47bd2eb31ced8fa7700bbedc0778b768a485 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allclean
@@ -1,4 +1,6 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,8 +8,6 @@ cleanCase
rm -rf constant/wallFilmRegion
rm -rf 0
-cp -rf 0.org 0
-
rm -f *.obj
-#rm -rf VTK
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
index a283228a8555537132a0dd0946434560e687e28a..0e3c1209c5bc981b7e0be9cfaf2192a70b2b46dd 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre
@@ -1,6 +1,8 @@
#!/bin/sh
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cp -rf 0.org 0
+
runApplication blockMesh
runApplication setSet -batch wallFilmRegion.setSet
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/H2O b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/H2O
deleted file mode 100644
index c1040eecef84b92a5f7ac612970a379c1a97c3cf..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/H2O
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.0;
-
-boundaryField
-{
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/N2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/N2
deleted file mode 100644
index 0ff5fca8ced2532b66ef5868c9c9e94aa2465838..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/N2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object N2;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.79;
-
-boundaryField
-{
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/O2 b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/O2
deleted file mode 100644
index 000ad6391c9832c4f266622a12e65129a9e55233..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/O2
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object O2;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.21;
-
-boundaryField
-{
- sides
- {
- type zeroGradient;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/T
deleted file mode 100644
index 401abd83edd0c601fc98787baf945a5dd9911c08..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/T
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- location "0";
- class volScalarField;
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- sides
- {
- type fixedValue;
- value uniform 300;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform 300;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/U
deleted file mode 100644
index bbc1b46eddaa865ae4a8e067eacf47ed0b698f79..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/U
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- sides
- {
- type pressureInletOutletVelocity;
- value uniform (0 0 0);
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p
deleted file mode 100644
index 8d41ed7bb752e806860ee59dfb5b13fd3c1906a1..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p
+++ /dev/null
@@ -1,36 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- sides
- {
- type calculated;
- value $internalField;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type calculated;
- value $internalField;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p_rgh b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p_rgh
deleted file mode 100644
index 0a4911a476ea23e713d3e055aa44cb8c96332466..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/p_rgh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p_rgh;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- sides
- {
- type buoyantPressure;
- }
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type buoyantPressure;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Tf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Tf
deleted file mode 100644
index 27907a23e34ce91405d3730a652de1f74427e537..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Tf
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object Tf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 300;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- side1
- {
- type zeroGradient;
- }
-
- side2
- {
- type zeroGradient;
- }
-
- side3
- {
- type zeroGradient;
- }
-
- side4
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Uf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Uf
deleted file mode 100644
index f62ab5eab4b1aba7a172b58f2aca00b98c27f349..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/Uf
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0/wallFilmRegion";
- object Uf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type slip;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- side1
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- side2
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- side3
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-
- side4
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/deltaf b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/deltaf
deleted file mode 100644
index ed6be8ec4b5e2a248d2fc407cc310a9731a53923..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/0/wallFilmRegion/deltaf
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.com |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0/wallFilmRegion";
- object deltaf;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 0 0 0 0 0];
-
-internalField uniform 0.00013;
-
-boundaryField
-{
- wallFilmFaces_top
- {
- type zeroGradient;
- }
-
- region0_to_wallFilmRegion_wallFilmFaces
- {
- type zeroGradient;
- }
-
- side1
- {
- type zeroGradient;
- }
-
- side2
- {
- type zeroGradient;
- }
-
- side3
- {
- type zeroGradient;
- }
-
- side4
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
index 50d71cadc33ae76ed7d264ab889a617c67f2ebda..4b9a47bd2eb31ced8fa7700bbedc0778b768a485 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allclean
@@ -1,4 +1,6 @@
#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@@ -6,8 +8,6 @@ cleanCase
rm -rf constant/wallFilmRegion
rm -rf 0
-cp -rf 0.org 0
-
rm -f *.obj
-#rm -rf VTK
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
index 9a3ccd9521a07066a40d0e5746c8604f208f8e04..14da52453ed735ef3b94371277f95c0421540811 100755
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre
@@ -1,6 +1,8 @@
#!/bin/sh
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cp -rf 0.org 0
+
runApplication blockMesh
runApplication setSet -batch wallFilmRegion.setSet
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
index c31c76b9744c7cb0d51a86d4ae17a5d488dda87e..08e549dacfe34cbb8d09510f0ebdf785590e3040 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index d15026b3b0d6c81a2b063b40bf86528de5216406..057d8bf8dd76dd03931ef34eada94930c3945ff6 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -1,6 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
+
+(
+ cd flange || exit
+ ./Allrun
+)
+
exit 0
# These cases are links to solver test cases and are run when the Allrun
diff --git a/wmake/rules/linux64Icc/c++Opt b/wmake/rules/linux64Icc/c++Opt
index c5a519aac9757eb3bfdc0e1df2a919f4cd352a74..28a17f783cae1846508385ed35e278b34e6cea64 100644
--- a/wmake/rules/linux64Icc/c++Opt
+++ b/wmake/rules/linux64Icc/c++Opt
@@ -1,2 +1,3 @@
c++DBUG =
-c++OPT = -xSSE3 -O3 -no-prec-div
+#c++OPT = -xSSE3 -O3 -no-prec-div
+c++OPT = -xSSE3 -O1 -no-prec-div