diff --git a/ReleaseNotes-1.5 b/ReleaseNotes-1.5
deleted file mode 100644
index fab8b8826e2ba9b6025755f8ae0ac3d2699d52a8..0000000000000000000000000000000000000000
--- a/ReleaseNotes-1.5
+++ /dev/null
@@ -1,176 +0,0 @@
-# -*- mode: org; -*-
-#
-#+TITLE: *OpenFOAM release notes for version 1.5*
-#+AUTHOR: OpenCFD Ltd.
-#+DATE: 07 October 2008
-#+LINK: http://www.opencfd.co.uk
-#+OPTIONS: author:nil ^:{}
-
-* Overview
- OpenFOAM-1.5 is is a significant upgrade to version 1.4 in ways which are
- outlined below. This release passes all our standard tests and the tutorials
- have been broadly checked. If there are any bugs, please report them using
- the instructions set out in: http://www.OpenFOAM.org/bugs.html.
-
- Most of the developments for this release are in: new applications, e.g. for
- multiphase flow and cavitation, buoyancy-flow and heat transfer, high speed
- flows and even molecular dynamics; new utilities, e.g. for meshing and case
- monitoring; and, new modelling, e.g. in Lagrangian particle tracking,
- radiation and rotating frames of reference. With these new applications come
- numerous new example cases.
-
-* GNU/Linux version
- The 64bit binary packs of the OpenFOAM release were compiled on a machine
- running SuSE GNU/Linux version 10.3 and the 32bit on a machine running Ubuntu
- GNU/Linux version 7.1 and also tested on Ubuntu 8.04. We recommend that
- users run OpenFOAM on one of these or a similar recent version of GNU/Linux.
- This release has also been successfully compiled and tested on older GNU/Linux
- releases but this requires the installation of Qt 4.3.? for ParaView-3 to run.
-
-* C++ Compiler version
- + Released compiled with GCC 4.3.1, the latest version.
- + Built in support for the Intel C++ 10.? compiler (untested).
- + The choice of the compiler is controlled by the setting of the $WM_COMPILER
- and $WM_COMPILER_ARCH environment variables in the OpenFOAM-1.5/etc/bashrc
- (or cshrc) file.
- + The location of the installation of the compiler is controlled by the
- $compilerInstall environment variable in the OpenFOAM-1.5/etc/settings.sh
- (or settings.csh) file.
-
-* Developments to solvers (applications)
- + New rhoCentralFoam solver for high-speed, viscous, compressible flows using
- non-oscillatory, central-upwind schemes.
- + New interDyMFoam solver for 2 incompressible, isothermal, immiscible fluids
- using a VoF phase-fraction based interface capturing approach, with optional
- mesh motion and mesh topology changes including adaptive mesh
- (un)refinement. Useful for simulations such as tank filling, sloshing ---
- using solid body motion e.g. SDA or SKA (6DoF) --- and slamming (using the
- mesh motion solver) and other large-scale applications that benefit from the
- efficiency gain of adaptive mesh (un)refinement of the interface.
- + New compressibleInterFoam solver for 2 compressible, isothermal, immiscible
- fluids using a volume of fluid (VoF) phase-fraction approach for
- interface-capturing. The momentum and other fluid properties are of the
- "mixture" and a single momentum equation is solved. Turbulence is modelled
- using a run-time selectable incompressible LES model.
- + New interPhaseChangeFoam solver for 2 incompressible, isothermal, immiscible
- fluids with phase-change, e.g. cavitation. Uses VoF interface capturing,
- with momentum and other fluid properties described for the ``mixture'' and a
- single momentum equation is solved. The set of phase-change models provided
- are designed to simulate cavitation but other mechanisms of phase-change are
- supported within this solver framework.
- + New rasCavitatingFoam solver for transient cavitation using a barotropic
- compressibility model, with RAS turbulence.
- + New lesCavitatingFoam solver for transient cavitation using a barotropic
- compressibility model, with LES turbulence.
- + New chtMultiRegionFoam solver that couples conjugate heat transfer in a
- solid to a buoyancy-driven flow simulation.
- + New PDRFoam solver for compressible premixed/partially-premixed turbulent
- combustion that includes porosity/distributed resistance (PDR) modelling to
- handle regions containing solid blockages which cannot be resolved by the
- mesh. Requires the PDR fields.
- + New lesBuoyantFoam solver for transient, buoyant, turbulent flow of
- compressible fluids for ventilation and heat-transfer. Turbulence is
- modelled using a run-time selectable compressible LES model.
- + New rhoPimpleFoam solver for transient, turbulent flow of compressible
- fluids for ventilation and heat-transfer. Uses the flexible PIMPLE
- (PISO-SIMPLE) solution for time-resolved and pseudo-transient simulations.
- + New buoyantSimpleRadiationFoam solver for steady-state, buoyant, turbulent
- flow of compressible fluids with radiation, for ventilation and
- heat-transfer.
- + New rhoTurbTwinParcelFoam solver for transient for compressible, turbulent
- flow with two thermo-clouds.
- + New gnemdFOAM solver for general purpose molecular dynamics that simulates
- atoms in arbitrary shaped domains and average atomic/molecular quantities to
- the mesh to create field data.
- + New mdEqulibrationFoam solver to equilibrates and/or preconditions molecular
- dynamics systems.
- + Demonstration SRFSimpleFoam solver based on simpleFoam that incorporates the
- SRF extensions (see below) for rotating flows.
-
-* Automatic mesher
- New snappyHexMesh utility that generates split-hex meshes automatically from
- triangulated (STL) surface geometries. The mesh approximately conforms to
- the surface by iteratively refining a starting mesh and morphing the
- resulting split-hex mesh to the surface. An optional phase will shrink back
- the resulting mesh and insert cell layers. It has a flexible specification
- of mesh refinement level and robust surface handling with a pre-specified
- final mesh quality. It runs in parallel with a load balancing step every
- iteration.
-
-* Developments to utilities
- + New extrude2DMesh utility that extrudes 2D meshes into a 3D mesh. 2D meshes
- are described by faces with 2 points, so can be used in combination with 2D
- meshes converted with ccm26ToFoam.
- + New couplePatches functionality integrated into createPatch, which
- optionally synchronises ("couples") points and faces of coupled (cyclic,
- processor) patches.
- + New applyBoundaryLayer pre-processing utility to apply 1/7th power-law
- boundary layers at walls, starting from uniform or potential flow solutions.
- + New execFlowFunctionObjects utility executes functionObjects as a
- post-processing activity, e.g. probes, sampling, force calculation.
- + New changeDictionary utility makes batch changes to OpenFOAM input files,
- e.g. to change boundary conditions of field files.
- + New foamCalc utility, a generic post-processing field calculator tool
- + New molConfig pre-processing utility for molecular dynamics cases. Fills
- zones of a mesh with single crystal lattices of specified structure,
- density, orientation, alignment and temperature.
- + Extended splitMeshRegions utility to split multi-zone meshes, e.g. defined
- through cellZones, into separate meshes.
- + Extended the foamToVTK, decomposePar, reconstructPar and mapFields utilities
- to include support for multiple particle clouds in parallel processing.
-
-* Migration from ParaView 2.4 to ParaView 3.x
- + Rewritten OpenFOAM Reader Module for version 3, a major redesign of
- ParaView.
- + New features include viewing patch names, reading of Lagrangian data,
- handling of cell, face and point sets, multiple views.
-
-* Model development
- + Overhauled the lagrangian library to support multiple clouds.
- + New lagrangianIntermediate library incorporating a hierarchy of parcel and
- cloud types, accommodating kinematic, thermodynamic and reacting
- applications, including coupling to the new radiation library. Sub-models
- are added at the relevant level of physics, e.g.:
- - kinematic: injection, wall interaction, drag, dispersion;
- - thermo: heat transfer;
- - reacting: reacting composition, mass transfer, surface reactions.
- + New single rotating frame of reference (SRF) library for rotating flow
- applications, e.g. turbo-machinery.
- + New radiation library including the P1 model and associated Marshak boundary
- conditions for incident radiation.
- + New displacementInterpolation motion solver for flexible mesh scaling.
- + New molecularDynamics Lagrangian library to calculate intermolecular forces
- between spherically symmetrical monatomic species in arbitrary geometries.
-
-* New functionObjects
- To aid common monitoring and post-processing activities.
- + forces: calculate the force and moment on a patch or set of patches, e.g. to
- calculate the lift, drag and moment of an object in the flow.
- + forceCoeffs: calculate the normalised force and moment on a patch or set of
- patches, e.g. to calculate the lift, drag and moment coefficients of an
- object in the flow.
- + fieldAverage: calculate field arithmetic mean and prime-squared averages for
- a list of fields.
- + foamCalcFunctions: calculate field components, div, mag, magGrad or magSqr.
-
-* Improvements to boundary conditions
- + Generalised jumpCyclic type: cyclic condition with an additional prescribed
- jump in value.
- + fan type: specialisation of jumpCyclic, applying a prescribed jump in
- pressure to simulate a fan within a mesh.
- + Generalised advective outflow boundary condition based on solving D/Dt(psi,
- U) = 0 at the boundary.
- + Additional turbulent flow inlet to specify mixing length and frequency.
- + Generalisation of time varying set of boundary conditions.
-
-* Other
- + New argument-free command execution, e.g typing "icoFoam" without root and
- case directory arguments.
- + Extended time command line options.
- + Many enhancements to dictionary including macro substitution, optional
- merging and default/overwrite behaviour, enhanced "#include" file handling
- and the framework to support function evaluation.
- + Cross-links between applications and Doxygen documentation with the "-doc"
- argument.
- + Non-blocking, non-buffered, parallel transfers with potential scaling
- benefits for larger number of processors.
diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6
new file mode 100644
index 0000000000000000000000000000000000000000..6336192857367772ff8d60260d6dfcfbd4736fc7
--- /dev/null
+++ b/ReleaseNotes-1.6
@@ -0,0 +1,403 @@
+# -*- mode: org; -*-
+#
+#+TITLE: OpenFOAM release notes for version 1.6
+#+AUTHOR: OpenCFD Ltd.
+#+DATE: July 2009
+#+LINK: http://www.opencfd.co.uk
+#+OPTIONS: author:nil ^:{}
+
+* Overview
+ OpenFOAM-1.6 is a significant upgrade to version 1.5 in ways that are
+ outlined below. This release passes all our standard tests and the
+ tutorials have been broadly checked. If there are any bugs, please report
+ them using the instructions set out here:
+ http://www.OpenFOAM.org/bugs.html
+
+* GNU/Linux version
+ The 32bit and 64bit binary packs of the OpenFOAM release were compiled on
+ a machine running openSUSE GNU/Linux version 11.1 and also tested on
+ Ubuntu 9. We recommend that users run OpenFOAM on one of these, or on a
+ similarly recent version of GNU/Linux. This release has also been
+ successfully compiled and tested on older GNU/Linux releases, but this
+ requires the installation of Qt 4.3.? (the sources for which are supplied
+ with OpenFOAM-1.6, see README) for ParaView-3 to run.
+
+* C++ Compiler version
+ + Release compiled with GCC 4.3.3.
+ + Built-in support for the Intel C++ 10.? compiler (untested).
+ + The choice of the compiler is controlled by the setting of the
+ ~$WM_COMPILER~ and ~$WM_COMPILER_ARCH~ environment variables in the
+ /OpenFOAM-1.6/etc/bashrc/ (or /cshrc/) file.
+ + The location of the compiler installation is controlled by the
+ ~$compilerInstall~ environment variable in the
+ /OpenFOAM-1.6/etc/settings.sh/ (or /settings.csh/) file.
+
+* Library developments
+
+** Core library
+
+*** Regular Expressions
+ The addition of regular expressions marks a major improvement in usability.
+ + *New* =regExp= class provides support for accessing POSIX extended regular
+ expresssions from within OpenFOAM. See the manpages on your system (/man
+ 7 regex/) for more information about the extended regular expression
+ syntax. Since entire strings are matched, the =^= and =$= anchors are not
+ required.
+ + *New* =wordRe= class can contain a =word= or a =regExp= . The match()
+ method matches appropriately (as a =word= or as a =regExp=).
+ + *New* =stringListOps= to search string lists based on regular expressions,
+ =wordRe= or =wordReList= .
+ + =Istream= and =Ostream= now retain backslashes when reading/writing
+ strings. The backslash continues to be used as an escape character for
+ double-quote and newline, but otherwise get passed through "as-is" without
+ any other special meaning (ie, they are /not/ C-style strings). This
+ especially helps with input/output of regular expressions.
+
+*** Dictionary improvements/changes
+ + Dictionaries can use words (unquoted) or regular expressions (quoted) for
+ their keywords. When searching, an exact match has priority over a regular
+ expression match.
+ + The default =#inputMode= is now '=merge=', which corresponds to the most
+ general usage. The =#inputMode warn= corresponds to the previous default
+ behaviour.
+ + The *new* =#inputMode protect= can be used to conditionally merge default
+ values into existing dictionaries.
+ + *New* =digest()= method to calculate and return the SHA1 message digest
+
+*** Improved list containers
+ + It is now possible to append a =UList= to an existing =List= or
+ =DynamicList= .
+ + =DynamicList= is now much more flexible. It can be used with the
+ =append()= method, or with the =setSize()= method and =operator[]=, as per
+ =List= . =DynamicList= also has more methods for adjusting the space
+ allocated.
+ + =SortableList= now uses stable sort and allows =reverseSort()= as well.
+ =SortableList= is also more versatile - the indices mostly remain
+ unallocated until they are required in the =sort()= method. The sort
+ indices can be deallocated with the =shrink()= method. Works as expected
+ with =transfer()= and assignment from other lists.
+ + Specialization for =UList<bool>::operator[](..) const= to return =false=
+ for out-of-range elements. This allows lazy evaluation with no noticeable
+ change in performance.
+ + =PackedList= has much better performance, *new* lazy evaluation and *new*
+ auto-vivify of elements on assignment. Any auto-vivified elements will
+ also flood-fill the gaps with zero. The =append()= method can be used
+ like in =DynamicList= to append a single element. The =set()= method can
+ be used like in =labelHashSet= . A =PackedBoolList= can thus replace
+ =labelHashSet= in many places.
+ + *New* =UIndirectList= for an indirect list without storing the addressing.
+
+*** New hashing algorithms
+ + Bob Jenkins' hash routine for performance improvement (5-10% faster for
+ string hashing than the previous algorithm) and fewer collisions.
+ + SHA1 hashing and SHA1 message digests (NIST specification FIPS-180-1)
+ added. The SHA1 digest provides a compact (20 bytes) means of determining
+ if the contents of an object have changed. The *new* =OSHA1stream= class
+ can be used to calculate SHA1 digests for anything that can write to an
+ output stream.
+
+*** HashTable/HashSet improvements
+ + Performance improvements for querying on empty tables
+ + The =erase()= method can take a list of keys or the keys from any another
+ =HashTable=/=HashSet= .
+ + =HashSet= has an =operator[]() const= that allows the same syntax to be
+ used for =boolList=, =PackedBoolList= and =labelHashSet= .
+ + =HashSet has additional operators '+=', '-=', '&=' to add, remove or
+ intersect keys, respectively.
+
+*** Improved bool/Switch
+ + The =Switch= class has reduced the storage to be on par with =bool= . It
+ is now more flexible and behaves much more like a =bool= .
+ + The IO for =bool= uses =Switch= internally for reading, so the end-user
+ doesn't need to know if a particular class used =bool= or =Switch= .
+
+*** Miscellaneous container class improvments
+ + *New* Boost-style =StaticAssert= added. Which is useful to catch invalid
+ template sizes, for example.
+ + Various containers now have C++0x-style =cbegin()=, =cend()= iterator
+ methods.
+ + Various containers now have STL-style =empty()= method, which may be more
+ readable and universal than =!size()= or =!valid()= conditions.
+ + various containers now have an =xfer()= method for yielding their contents
+ to a corresponding =Xfer= class.
+
+*** *New* Xfer class
+ Provides finer grained control over copying or transferring objects with
+ very little overhead. It can be used for any object that has a =transfer()=
+ method and a =operator=()= copy method. Since it is decided upon
+ construction of the =Xfer= object whether the parameter is to be copied or
+ transferred, the contents of the resulting Xfer object can be transferred
+ unconditionally. This greatly simplifies defining constructors or methods in
+ other classes with mixed transfer/copy semantics without requiring 2^N
+ different versions.
+ + =xferCopy()=, =xferMove()= and =xferCopyTo()=, =xferMoveTo()= functions to
+ ease the use of the =Xfer= class.
+
+*** Convenience changes
+ + =IOobject= has a *new* constructor for creating an =IOobject= from a
+ single-path specification (eg, see =blockMesh -dict= option).
+ + =argList= has *new* convenience methods for accessing options more
+ directly: =option()=, =optionFound()=, =optionLookup()=, =optionRead()=,
+ =optionReadIfPresent()= .
+ + The *new* =readList(Istream&)= can read a bracket-delimited list or handle
+ a single value as a list of size 1. This can be a useful convenience when
+ processing command-line options.
+
+*** Misc. improvements
+ + Improved consistency and interoperability between =face= and =triFace= classes.
+ + =face::triangles()= can split and append to a =DynamicList=
+ + =coordinateSystems= can access global systems (similar to =MeshObject=)
+
+** Turbulence modelling
+ + Major development of turbulence model libraries to give extra flexibility
+ at the solver level. For solvers that can support either RAS/LES
+ computations, the selection is made in the /constant/turbulenceProperties/,
+ by setting the =simulationType= keyword to:
+ - =laminar=
+ - =RASModel=
+ - =LESModel=
+ + Depending on the selection, the model is the instantiated from /constant//
+ - /RASProperties/
+ - /LESProperties/
+
+**** RAS wall functions
+ Wall functions are now run-time selectable per patch for RAS.
+ + Velocity:
+ - Apply to turbulent viscosities =nut= or =mut=
+ - Apply to =k=, =Q=, =R=
+ - Apply to =epsilon=, =omega=
+ + Temperature:
+ - Apply to turbulent thermal diffusivity, =alphat= (compressible only)
+
+ + To apply wall functions:
+ - To recapture the functionality of previous OpenFOAM versions (v1.5 and
+ earlier) assign:
+ - for velocity:
+ - =nut=: =nutWallFunction=
+ - =mut=: =muWallFunction=
+ - =epsilon=: =epsilonWallFunction=
+ - =omega=: =omegaWallFunction=
+ - =k=, =Q=, =R=: =kQRWallFunction=
+ - for temperature:
+ - =alphat=: =alphatWallFunction=
+ - New =alphaSgsJayatillekeWallFunction= thermal wall function for
+ compressible LES
+
+**** *New* LES turbulence models
+ + Spalart-Allmaras DDES
+ + Spalart-Allmaras IDDES
+
+**** Upgrading:
+ + *New* utility - =applyWallFunctionBoundaryConditions=
+ + Solvers will automatically update existing cases
+ - New fields created based on the presence of the =nut/mut= field
+ - Boundary conditions include scoping, i.e compressibility:: for
+ compressible solvers
+ - Modified fields will be backed-up to /<field>.old/
+ + NOTE:
+ - Fields are only updated for those fields associated with the current
+ turbulence model selection, i.e. if fields exist for use with other
+ models, they will not be updated
+ - The new specification is not backwards compatible
+
+** Thermo-physical Models
+ + Old compressibility-based thermo package renamed
+ =basicThermo= \rightarrow =basicPsiThermo=
+ + *New* =basicRhoThermo= thermo package
+ - Additional density field stored
+ - General form - can be used for other types of media, e.g. liquids
+ - Additional polynomial-based thermodynamics
+ - Equation of state: =icoPolynomial=
+ - Transport: =polynomialTransport=
+ - Thermo: =hPolynomialThermo=
+ + Removed earlier hard-coding of gas thermophysics for chemistry modelling:
+ - =reactingMixture= now templated on thermo package
+ - =chemistryModel= now templated on thermo package
+ - =chemistrySolver= now templated on thermo package
+ + *New* =fvDOM= radition model
+ - finite volume, discrete ordinates method
+ + *New* (reinstated) =eThermo= thermodynamics package
+ - internal energy-based thermodynamics
+
+** Lagrangian
+
+**** Intermediate
+ + Overhaul of the underlying framework
+ + Reacting now split into reacting and reacting multiphase
+ + New structure for variable composition
+ + Many new sub-models, including:
+ - Injection
+ - =PatchInjection= - injection local to patch face cells
+ - =FieldActivatedInjection= - injection based on satisfying external
+ criterion
+ - LookupTableInjection - explicity define injection locations and all
+ parcel properties
+ - Post-processing
+ - patch post-processing - collect data for parcels impacting user
+ defined patches
+ - Patch interaction
+ - generalised behaviour for parcel interaction with patch
+ - Phase change
+ - liquid evaporation
+
+**** Coal combustion
+ + *New* library - extension of reacting-multiphase functionality
+ - Surface reaction/combustion models
+
+** Discrete methods
+ + *New* library offering DSMC simulation functionality - see =dsmcFoam=
+ below
+ + *New* libraries offering molecular dynamics simulation functionality - see
+ =mdFoam= and =mdEquilibrationFoam=: below.
+
+** *New* surfMesh library
+ Provides a more efficient storage mechanism than possible with =triSurface=
+ without restrictions on the shape of the face (templated parameter). It will
+ however take quite some time before it can fully replace =triSurface= .
+ + =MeshedSurface= class - with zero or more contiguous =surfZones= .
+ + =UnsortedMeshedSurface= class - unordered surface zones (as per
+ =triSurface=)
+ + =surfMesh= class - for reading/writing in native OpenFOAM format
+
+* Solver restructuring
+ The upgrade to the turbulence models means that the simulation type, i.e.
+ laminar, RAS or LES can be selected at run time. This has allowed a reduction
+ in the number of solvers, simplifying the overall code structure
+ + Solvers which support laminar, RAS and LES:
+ - =turbFoam=, =oodles= \rightarrow =pisoFoam=
+ - =turbDyMFoam= \rightarrow =pimpleDyMFoam=
+ - =rhoTurbFoam=, =coodles= \rightarrow =rhoPisoFoam=
+ - =xoodles= \rightarrow absorbed into =XiFoam=
+ - =buoyantFoam=, =lesBuoyantFoam= \rightarrow =buoyantPisoFoam=
+ - =interFoam=, =rasInterFoam=, =lesInterFoam= \rightarrow =interFoam=
+ - =lesCavitatingFoam=, =rasCavitatingFoam= \rightarrow =cavitatingFoam=
+ + Solvers which support LES only:
+ - =channelOodles= \rightarrow =channelFoam= (LES)
+
+* General changes
+ + pd to p ------------------------------------------------------------ [HENRY]
+ + gravity ------------------------------------------------------------ [HENRY]
+
+** Solver control improvments
+ Use dictionary entries instead of an =Istream= for the solver controls.
+ + This Allows dictionary substitutions and regular expressions in
+ /system/fvSolution/
+ + The old solver control syntax is still supported (warning emitted), but
+ the *new* =foamUpgradeFvSolution= utility can be used to convert
+ /system/fvSolution/ to the new format.
+
+* Tutorial restructuring
+ to reflect solver application structure
+
+* Post-processing ---------------------------------------------------- [MATTIJS]
+ + SAMPLING - improved plane, iso-surface handling
+ + Output to any surface geometry format supported by the =surfMesh= library.
+
+* *New* Solvers
+ + =buoyantBoussinesqSimpleFoam=
+ Steady state heat transfer solver using a Boussinesq approximation for
+ buoyancy, with laminar, RAS or LES turbulence modelling
+ + =buoyantBoussinesqPisoFoam=
+ Transient heat transfer solver using a Boussinesq approximation for
+ buoyancy, with laminar, RAS or LES turbulence modelling
+ + =coalChemistryFoam=
+ Transient, reacting lagrangian solver, employing a coal cloud and a thermo
+ cloud, with chemistry, and laminar, RAS or LES turbulence modelling
+ + =porousExplicitSourceReactingParcelFoam=
+ Transient, reacting lagrangian solver, employing a single phase reacting
+ cloud, with porous media, explicit mass sources, and laminar, RAS or LES
+ turbulence modelling
+ + =rhoReactingFoam=
+ Density-based thermodynamics variant of the reactingFoam solver, i.e. now
+ applicable to liquid systems
+ + =dsmcFoam=
+ DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics
+ simulations, able to simulate mixtures of an arbitrary number of gas species.
+ The variable hard sphere collision model with Larsen-Borgnakke internal
+ energy redistribution (see "Molecular Gas Dynamics and the Direct Simulation
+ of Gas Flows" G.A. Bird, 1994) is available; other run-time selectable
+ collision models can be easily added.
+
+* Updated solvers
+ + =mdFoam=
+ Molecular Dynamics (MD) solver able to simulate a mixture of an arbitrary
+ number of mono-atomic and small, rigid polyatomic (i.e. H2O, N2) molecular
+ species, with 6 degree of freedom motion, in complex geometries. A molecule
+ of any species can be built by specifying its sites of mass and charge. All
+ molecules interact with short-range dispersion forces and pairwise
+ electrostatic interactions using methods described in:
+ Fennell and Gezelter, J. Chem. Phys. 124, 234104 (2006)
+ + =mdEquilibrationFoam=
+ Similar to mdFoam, but employs velocity scaling to adjust the simulation
+ temperature to a target value. Useful to equilibrate a case before
+ simulation.
+
+* Function objects
+
+** Improvements for function objects and time-looping
+ + The =functionObjectList= retains the order of the =functionObject= order,
+ which allows a chaining of operations. It is thus internally more
+ efficient when /system/controlDict/ uses =functions {..}= instead of
+ =functions (..)=, but both forms are supported.
+ + The =functionObject= now has an additional =end()= method that is called
+ when =Time::loop()= or =Time::run()= determine that the time-loop exits.
+ Accordingly, one of these two idioms should be used in solver code:
+ 1. =while (runTime.loop() { ... }=
+ 2. =while (runTime.run()) { runTime++; ... }=
+ + *New* - =functionObjectList= now tracks the SHA1 message digest of the
+ sub-directories. This avoids reloading a =functionObject= when
+ something unrelated in /system/controlDict/ changed.
+
+** *New* function objects:
+ + =systemCall= - executes a list of system instructions
+ + =fieldMinMax= - computes the min/max of a <field>
+ + =staticPressure= - converts kinematic pressure to static pressure
+ + =dsmcFields= - calculates intensive fields (velocity and temperature) from
+ averaged extensive fields (i.e. momentum and energy)
+
+** Usage
+ + Improved output control: =timeStep= or =outputTime=
+
+* Boundary conditions
+ + Improved set of direct mapped boundary conditions
+ + Buoyancy boundary condition ---------------------------------------- [HENRY]
+
+* Utilities
+
+** Improvements
+ + =blockMesh= has a *new* =-dict= option for specifying an alternative
+ dictionary for the block mesh description. The '=convertToMeters=' entry
+ is now optional, and the alternative '=scale=' entry can be used for
+ less typing.
+
+ + =foamToEnsight= has a *new* =-noPatches= option to suppress generation
+ of patches.
+
+ + =foamToEnsightParts= has *new* =-noMesh= and =-index= options that can
+ be useful when post-processing results incrementally.
+
+** *New* utilities
+ + =particleTracks= - generate particle tracks for lagrangian calculations
+ + =dsmcInitialise= - preprocessing utility to create initial configurations of
+ DSMC particles in a geometry
+
+*** *New* foamCalc functions
+ + =interpolate= - performs fvc::interpolate(<field>)
+ + =randomise= - randomises a <field> by a given perturbation
+ + =addSubtract= - simple add/subtract field functionality
+
+** Usage
+ + =timeSelector= can now combine =-time ranges= and =-latestTime= options.
+ More reliable behaviour for cases missing /constant// or /0//
+ directories. When the =-noZero= option is enabled, =-latestTime= will not
+ select the =0/= directory unless the =-zeroTime= option is given.
+ This helps avoid ill effects caused by accidentally using the
+ /0// directory in certain utilities (eg, =reconstructPar=).
+
+** Improvements to Paraview reader module
+ + =PV3FoamReader= added mesh region handling. The region name is parsed
+ from the filename. Eg, /case{region}.OpenFOAM/
+ + =paraFoam= with a *new* =-region= option for specifying an alternative
+ region. A *new* =-touch= option to generate the /.OpenFOAM/ file only.
+ Only creates (and removes) /.OpenFOAM/ files if they didn't already
+ exist, which is useful in connection with the =-touch= option.
diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H
index 2a7753e14e1f5efcc31edcf3f2e2e721d5dde045..9697c6e1ed2d0753f9c0803081cc6929050ef446 100644
--- a/applications/solvers/combustion/XiFoam/UEqn.H
+++ b/applications/solvers/combustion/XiFoam/UEqn.H
@@ -7,6 +7,8 @@
rho*g
);
+ UEqn.relax();
+
if (momentumPredictor)
{
solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 4c544b433e3b0aba41261d237fc198bc616412a4..6e804be977b1eec581016550cfb0c21cb44113d2 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -87,12 +87,12 @@ int main(int argc, char *argv[])
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
- #include "rhoEqn.H"
- #include "UEqn.H"
-
- // --- PISO loop
- for (int corr=1; corr<=nCorr; corr++)
+ // --- Pressure-velocity PIMPLE corrector loop
+ for (int oCorr=0; oCorr<nOuterCorr; oCorr++)
{
+ #include "rhoEqn.H"
+ #include "UEqn.H"
+
#include "ftEqn.H"
#include "bEqn.H"
#include "huEqn.H"
@@ -103,10 +103,14 @@ int main(int argc, char *argv[])
hu == h;
}
- #include "pEqn.H"
- }
+ // --- PISO loop
+ for (int corr=1; corr<=nCorr; corr++)
+ {
+ #include "pEqn.H"
+ }
- turbulence->correct();
+ turbulence->correct();
+ }
rho = thermo.rho();
diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index 33ef24bfe655b2d587b7e403fbd8ee1f5d25b736..d06ec2e5f0a1252c1262bcdc702c65ddb759b485 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@@ -52,7 +52,7 @@ if (ign.ignited())
+ mvConvection->fvmDiv(phi, b)
+ fvm::div(phiSt, b, "div(phiSt,b)")
- fvm::Sp(fvc::div(phiSt), b)
- - fvm::laplacian(turbulence->muEff(), b)
+ - fvm::laplacian(turbulence->alphaEff(), b)
);
@@ -90,7 +90,7 @@ if (ign.ignited())
// ~~~~~~~~~~~~~~~~~
surfaceScalarField phiXi =
phiSt
- - fvc::interpolate(fvc::laplacian(turbulence->muEff(), b)/mgb)*nf
+ - fvc::interpolate(fvc::laplacian(turbulence->alphaEff(), b)/mgb)*nf
+ fvc::interpolate(rho)*fvc::interpolate(Su*(1.0/Xi - Xi))*nf;
diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H
index 519cbd7cbe4bfa08623d7a62678ebf5188bfee1b..46d7aeae8228a9d47d3cc28eac64c8b5a65cfb3e 100644
--- a/applications/solvers/combustion/XiFoam/ftEqn.H
+++ b/applications/solvers/combustion/XiFoam/ftEqn.H
@@ -1,7 +1,7 @@
tmp<fv::convectionScheme<scalar> > mvConvection
(
fv::convectionScheme<scalar>::New
- (
+ (
mesh,
fields,
phi,
@@ -17,6 +17,6 @@ if (composition.contains("ft"))
(
fvm::ddt(rho, ft)
+ mvConvection->fvmDiv(phi, ft)
- - fvm::laplacian(turbulence->muEff(), ft)
+ - fvm::laplacian(turbulence->alphaEff(), ft)
);
}
diff --git a/applications/solvers/combustion/XiFoam/hEqn.H b/applications/solvers/combustion/XiFoam/hEqn.H
index ebce30e24e50dee92824de875abfa138f0abf3b1..513ae604419f28b96bbf455e8ed0bc1e75d258bb 100644
--- a/applications/solvers/combustion/XiFoam/hEqn.H
+++ b/applications/solvers/combustion/XiFoam/hEqn.H
@@ -1,5 +1,5 @@
{
- solve
+ fvScalarMatrix hEqn
(
fvm::ddt(rho, h)
+ mvConvection->fvmDiv(phi, h)
@@ -8,5 +8,8 @@
DpDt
);
+ hEqn.relax();
+ hEqn.solve();
+
thermo.correct();
}
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 680bd784e0e2a54876111eecdf5ca23a6d06119d..578d8c051c103a9ad0a7487dd72ff644d79a04fe 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -68,10 +68,10 @@ int main(int argc, char *argv[])
#include "chemistry.H"
#include "rhoEqn.H"
- #include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
{
+ #include "UEqn.H"
#include "YEqn.H"
#include "hEqn.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index b6ede7054d401f43bdd6b777835c59bcfefd4f50..4714ca611c784d57fd6b598ba1f3b148a36dbcce 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -2,11 +2,10 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -IBCs/lnInclude \
+ -IBCs/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
- -lspecie \
- -L$(FOAM_USER_LIBBIN) \
+ -lspecie \
-lrhoCentralFoam
diff --git a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
index 065aa19c6c93e1f02c327f3e98b2eb149c0f7ad3..a985c6eb95e1c9c5eb11c531912503351e19296c 100644
--- a/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/bubbleFoam/alphaEqn.H
@@ -46,3 +46,5 @@
<< " Max(alpha) = " << max(alpha).value()
<< endl;
}
+
+rho = alpha*rhoa + beta*rhob;
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 9aca6933fc300f754f064f3b2ad95c05168e7fdd..9367838a52bcfa3d43337c70396d7c865e4c2504 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -156,6 +156,16 @@
+ fvc::interpolate(beta)*phib
);
+ volScalarField rho
+ (
+ IOobject
+ (
+ "rho",
+ runTime.timeName(),
+ mesh
+ ),
+ alpha*rhoa + beta*rhob
+ );
#include "createRASTurbulence.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
index e8b056ed7e8b4b39099790cb2b922b5540eb1a69..47057c0efb44ce9bfa26e50a70fc0588dd3df682 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H
@@ -52,3 +52,5 @@
<< endl;
}
}
+
+rho = alpha*rhoa + beta*rhob;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index 1fdaf944bb4dcfa00a07a3c51fbe5e26ef69afb7..8a176157152c6b3042870796b53644f7e467aeaf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -145,6 +145,16 @@
fvc::interpolate(alpha)*phia + fvc::interpolate(beta)*phib
);
+ volScalarField rho
+ (
+ IOobject
+ (
+ "rho",
+ runTime.timeName(),
+ mesh
+ ),
+ alpha*rhoa + beta*rhob
+ );
IOdictionary RASProperties
(
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 1d034714efe91a489d0f6a90b5f8c2d67988ea6c..b4bd379d759a4f7f033010b6270efd41baf06559 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -348,7 +348,8 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
- Info<< nl << "end" << endl;
+ Info<< nl << "End" << endl;
+
return 0;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 881bb4b05a3ae7a5da76a3f6a500e68d7134bd3d..fc0c3db61cbc4e968edb040fe328a0c1fc66f41c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -492,6 +492,8 @@ int main(int argc, char *argv[])
delete ensightCaseFilePtr;
}
+ Info<< "End\n" << endl;
+
return 0;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
index 6c7e23ebaef33f6737fa31a2aa18e463d578ae8e..66d4b6e43e79fc6ce9b67d447107d38cfcbc8dc7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
}
}
- Info << nl << "Translation Complete." << nl;
+ Info<< "\nEnd\n" << endl;
return 0;
}
diff --git a/applications/utilities/postProcessing/foamCalc/foamCalc.C b/applications/utilities/postProcessing/foamCalc/foamCalc.C
index 717a63e1ec912573e486211189600727176b9106..c673ed24552a2ecbeb0fe5204db77a98193da24f 100644
--- a/applications/utilities/postProcessing/foamCalc/foamCalc.C
+++ b/applications/utilities/postProcessing/foamCalc/foamCalc.C
@@ -84,6 +84,8 @@ int main(int argc, char *argv[])
utility().tryPostCalc(args, runTime, mesh);
+ Info<< "End\n" << endl;
+
return 0;
}
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
index cbe13fd0d2b901878455c385a2d9c4aef372f1fb..49f9016dc1ff2906a8bb5523b69e5b0efd462a8d 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C
@@ -359,4 +359,5 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
return vtkmesh;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
index 3151813864666e5964f2d496087d31b40b06117a..14c5da92c2ab27bdb462d2acb0b22aa4f5913582 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
@@ -38,7 +38,6 @@ Description
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
(
const fvMesh& mesh,
@@ -111,7 +110,6 @@ vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
}
-
vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
(
const fvMesh& mesh,
@@ -148,4 +146,5 @@ vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
return vtkmesh;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
index 310a12efdf61fbff11d204c762dd8997d6bfdef0..59e445e341c60784bd3eea82a8ec830270a39763 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C
@@ -519,6 +519,5 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields()
}
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
index 9d37d2e1bffc23e85d4135e5de16500fc29d1421..aff0ea4eec14334b336a568665ea4d44d18adb0d 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C
@@ -338,4 +338,5 @@ void Foam::vtkPV3Foam::printMemory()
}
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
new file mode 100644
index 0000000000000000000000000000000000000000..1dcc0258d537ffe209e6ce5ea19a7a6a31a6536c
--- /dev/null
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5.x |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object particleTrackProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+cloudName reactingCloud1;
+
+sampleFrequency 1;
+
+maxPositions 1000000;
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/Co/Co.C b/applications/utilities/postProcessing/velocityField/Co/Co.C
index 23d7b008a7d3dddd22b4f7f736975d71e7ec4c2a..2faa212583c2848d3248c3f499c2c9ee972f611b 100644
--- a/applications/utilities/postProcessing/velocityField/Co/Co.C
+++ b/applications/utilities/postProcessing/velocityField/Co/Co.C
@@ -179,6 +179,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No phi" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
index 0b42de1404ab4f0b9bb5ea3a07a85ddecbe1b079..0b64ebd163337afdeb4527a3a4bf9d2f25dd2486 100644
--- a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
+++ b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -78,6 +78,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No U" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 2e7c517e9d0358f7bbdb37ea0e121384b755f356..cec41457f35ffcc44b4710d30ed5ad3f7612bf75 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -134,6 +134,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " Missing U or T" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 05c9ca1a0d2488dcd717df604e96f230f9cb9c7b..0af52d405afb7239200be8ef7b057a026ffb483d 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -361,6 +361,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No phi" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/Q/Q.C b/applications/utilities/postProcessing/velocityField/Q/Q.C
index 34a09790d145896619e846f2e33d42bf379f9a00..08c214a394adf08034b8a28f9ea424f90e3c52fb 100644
--- a/applications/utilities/postProcessing/velocityField/Q/Q.C
+++ b/applications/utilities/postProcessing/velocityField/Q/Q.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -105,6 +105,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No U" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
index 96ccb4b9079920f86d3b5b5304deb2aaff9af349..d510ee3849a8dc950b4bb1221d8dc8d46b116957 100644
--- a/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
+++ b/applications/utilities/postProcessing/velocityField/enstrophy/enstrophy.C
@@ -80,6 +80,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No U" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
diff --git a/applications/utilities/postProcessing/velocityField/flowType/flowType.C b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
index 20e425864d29573d60ace929691537770cc93e91..343ff0517d6bf0f116a8ea9255d42bd187c16a48 100644
--- a/applications/utilities/postProcessing/velocityField/flowType/flowType.C
+++ b/applications/utilities/postProcessing/velocityField/flowType/flowType.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -87,6 +87,8 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No U" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
index 68d4c8d6980891bb15dd73206a01a82c2e47804f..44ab386d9fa5b5c1682eab319aa28c72b30b0b6e 100644
--- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
+++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -460,7 +460,7 @@ int main(int argc, char *argv[])
}
}
- Info<< "End\n" << endl;
+ Info<< "\nEnd\n" << endl;
return 0;
}
diff --git a/applications/utilities/postProcessing/velocityField/uprime/uprime.C b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
index c1f7071f744d1cb2e8ba9260a257f50a5839e5e6..54012aef9a40f3203f4710c068a2f5d9f98c46e3 100644
--- a/applications/utilities/postProcessing/velocityField/uprime/uprime.C
+++ b/applications/utilities/postProcessing/velocityField/uprime/uprime.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -80,6 +80,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No k" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
+
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
index 3b4a85ca3e603927a8fed3b3257ce64b6d36ff07..e59384f3c07daa58f0cf162caa0469a710aacdb8 100644
--- a/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
+++ b/applications/utilities/postProcessing/velocityField/vorticity/vorticity.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*---------------------------------------------------------------------------* \
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
@@ -93,6 +93,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
Info<< " No U" << endl;
}
+
+ Info<< "\nEnd\n" << endl;
}
+
// ************************************************************************* //
diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index c4d7c85acb57ce46cade063b40d4a69eb5c8d81f..210b1bcc60605ba4a112f87700d77456968f2aee 100755
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@@ -50,7 +50,7 @@ elif [ -d "./system" ]
then
# Normal case.
parentDir=`dirname $PWD`
- application=`basename $parentDir`
+ application=`getApplication`
runApplication blockMesh
runApplication $application
else
diff --git a/bin/foamTemplates/source/foamTemplate.C b/bin/foamTemplates/source/foamTemplate.C
index 903fe66b5f50909b991291f4608f89491a96da35..1f86ef69f8739499da8d8ce3c6048583aeb56c7d 100644
--- a/bin/foamTemplates/source/foamTemplate.C
+++ b/bin/foamTemplates/source/foamTemplate.C
@@ -31,7 +31,13 @@ License
const dataType Foam::className::staticData();
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -71,12 +77,6 @@ Foam::className::~className()
{}
-// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
diff --git a/bin/foamTemplates/source/newSource b/bin/foamTemplates/source/newSource
old mode 100644
new mode 100755
diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index e7a5da07536e87ae69fe6b9f63ac26b83048ea47..4a2015febfd45def70f081c9752b1cb17faa8fdf 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -61,12 +61,17 @@ cleanTimeDirectories ()
cleanCase ()
{
cleanTimeDirectories
+ rm -rf processor* > /dev/null 2>&1
+ rm -rf probes* > /dev/null 2>&1
+ rm -rf forces* > /dev/null 2>&1
- rm -rf constant/polyMesh/{allOwner*,cell*,face*,meshModifiers*} \
+ rm -rf system/machines \
+ constant/polyMesh/{allOwner*,cell*,face*,meshModifiers*} \
constant/polyMesh/{owner*,neighbour*,point*,edge*} \
constant/polyMesh/{cellLevel*,pointLevel*,refinementHistory*,surfaceIndex*} \
- constant/{cellLevel*,pointLevel*} \
+ constant/{cellToRegion,cellLevel*,pointLevel*} \
constant/polyMesh/sets/ \
+ VTK \
> /dev/null 2>&1
for f in `find . -name "*Dict"`
@@ -76,13 +81,6 @@ cleanCase ()
done
}
-cleanParallelCase ()
-{
- cleanCase
-
- rm -rf processor* > /dev/null 2>&1
-}
-
removeCase ()
{
echo "Removing $case case"
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 5afb39a9503a8a100cc50933f037f88284f53ee9..e2c335b05b11c3b4a6b76cbd3102ce7fa63bde78 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -29,15 +29,21 @@
#
#------------------------------------------------------------------------------
+getApplication ()
+{
+ grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/"
+}
+
runApplication ()
{
APP_RUN=$1; shift
+ APP_NAME=${APP_RUN##*/}
- if [ -f log.$APP_RUN ] ; then
- echo "$APP_RUN already run on $PWD: remove log file to run"
+ if [ -f log.$APP_NAME ] ; then
+ echo "$APP_NAME already run on $PWD: remove log file to run"
else
echo "Running $APP_RUN on $PWD"
- $APP_RUN $* > log.$APP_RUN 2>&1
+ $APP_RUN $* > log.$APP_NAME 2>&1
fi
}
@@ -48,18 +54,8 @@ runParallel ()
if [ -f $log.$APP_RUN ] ; then
echo "$APP_RUN already run on $PWD: remove log file to run"
else
- if [ "$WM_MPLIB" = LAM ]
- then
- echo "Starting LAM using $2 machines file"
- lamboot -v $2
- fi
echo "Running $APP_RUN in parallel on $PWD using $1 processes"
( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 )
- if [ "$WM_MPLIB" = LAM ]
- then
- echo "Stopping LAM"
- lamclean
- fi
fi
}
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 0368b02e2ea53c02e5cd66ea767e118ef7577f64..1de08115736c84aa9736423472c88900586c0460 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -36,7 +36,7 @@ defineTypeNameAndDebug(Foam::IOobject, 0);
// Return components following the IOobject requirements
//
-// behaviour
+// behaviour
// input IOobject(instance, local, name)
// ----- ------
// "foo" ("", "", "foo")
@@ -58,7 +58,7 @@ bool Foam::IOobject::IOobject::fileNameComponents
name.clear();
// called with directory
- if (!isDir(path))
+ if (isDir(path))
{
WarningIn("IOobject::fileNameComponents(const fileName&, ...)")
<< " called with directory: " << path << "\n";
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
index 9d01de9d90e8c254dc4d47678885dc2b30a8a7eb..452ad35ac606de8ea78b923eb85e5d89f58b772c 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C
@@ -82,15 +82,21 @@ Foam::objectRegistry::objectRegistry
Foam::objectRegistry::~objectRegistry()
{
+ List<regIOobject*> myObjects(size());
+ label nMyObjects = 0;
+
for (iterator iter = begin(); iter != end(); ++iter)
{
if (iter()->ownedByRegistry())
{
- regIOobject* object = iter();
- erase(iter);
- delete object;
+ myObjects[nMyObjects++] = iter();
}
}
+
+ for (label i=0; i<nMyObjects; i++)
+ {
+ checkOut(*myObjects[i]);
+ }
}
@@ -235,7 +241,7 @@ bool Foam::objectRegistry::checkOut(regIOobject& io) const
<< endl;
}
}
-
+
return false;
}
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index 033d3d50a048a7f68980e9b24ad0005305c1fb2f..2f31e0e9c4789fb9246fb096d1f00cbe59d3cf88 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -32,7 +32,7 @@ inline bool Foam::regIOobject::ownedByRegistry() const
}
-void Foam::regIOobject::store()
+inline void Foam::regIOobject::store()
{
ownedByRegistry_ = true;
}
@@ -74,18 +74,18 @@ inline Type& Foam::regIOobject::store(autoPtr<Type>& atPtr)
}
-void Foam::regIOobject::release()
+inline void Foam::regIOobject::release()
{
ownedByRegistry_ = false;
}
-Foam::label Foam::regIOobject::eventNo() const
+inline Foam::label Foam::regIOobject::eventNo() const
{
return eventNo_;
}
-Foam::label& Foam::regIOobject::eventNo()
+inline Foam::label& Foam::regIOobject::eventNo()
{
return eventNo_;
}
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index e43a0d741d7b7a3c44be8571bad9e85acfb7cae2..61087c20d33536bf1798e169829784ef7b9f93ec 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -97,7 +97,7 @@ public:
//- Construct given SphericalTensor
inline SymmTensor(const SphericalTensor<Cmpt>&);
- //- Construct given the nine components
+ //- Construct given the six components
inline SymmTensor
(
const Cmpt txx, const Cmpt txy, const Cmpt txz,
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
index 8f3381ea45a634a60de6614e33b6f9eadd13f709..e2d1463f7d617e8a2e9d22e9e7aad90238b7894c 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
@@ -32,7 +32,6 @@ template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial()
:
VectorSpace<Polynomial<PolySize>, scalar, PolySize>(),
- name_("unknownPolynomialName"),
logActive_(false),
logCoeff_(0.0)
{}
@@ -42,16 +41,17 @@ template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
:
VectorSpace<Polynomial<PolySize>, scalar, PolySize>(),
- name_(is),
logActive_(false),
logCoeff_(0.0)
{
- if (name_ != name)
+ word isName(is);
+
+ if (isName != name)
{
FatalErrorIn
(
"Polynomial<PolySize>::Polynomial(const word&, Istream&)"
- ) << "Expected polynomial name " << name << " but read " << name_
+ ) << "Expected polynomial name " << name << " but read " << isName
<< nl << exit(FatalError);
}
@@ -63,7 +63,7 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
FatalErrorIn
(
"Polynomial<PolySize>::Polynomial(const word&, Istream&)"
- ) << "Polynomial coefficients for entry " << name_
+ ) << "Polynomial coefficients for entry " << isName
<< " are invalid (empty)" << nl << exit(FatalError);
}
}
@@ -72,12 +72,10 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial
(
- const word& name,
const Polynomial<PolySize>& poly
)
:
VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
- name_(name),
logActive_(poly.logActive_),
logCoeff_(poly.logCoeff_)
{}
@@ -85,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template<int PolySize>
-const Foam::word& Foam::Polynomial<PolySize>::name() const
-{
- return name_;
-}
-
-
template<int PolySize>
bool& Foam::Polynomial<PolySize>::logActive()
{
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
index c1e2b580090235841c2f83260c04a1bf5543c72b..9d787f6c1ba3e3d06f709cd516de8882dd73e58e 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
+++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
@@ -82,9 +82,6 @@ class Polynomial
{
// Private data
- //- Polynomial name
- word name_;
-
//- Include the log term? - only activated using integrateMinus1()
bool logActive_;
@@ -107,17 +104,14 @@ public:
//- Construct from name and Istream
Polynomial(const word& name, Istream& is);
- //- Copy constructor with name
- Polynomial(const word& name, const Polynomial& poly);
+ //- Copy constructor
+ Polynomial(const Polynomial& poly);
// Member Functions
// Access
- //- Return const access to the polynomial name
- const word& name() const;
-
//- Return access to the log term active flag
bool& logActive();
diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
index 2a0d2187aa79c1df3d7051527598263216d4c76e..5da0a67d64e2c084b628a23e2f930b49f78a27e9 100644
--- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
+++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C
@@ -35,8 +35,7 @@ Foam::Ostream& Foam::operator<<
const Polynomial<PolySize>& poly
)
{
- os << poly.name_ << token::SPACE
- << static_cast
+ os << static_cast
<VectorSpace<Polynomial<PolySize>, scalar, PolySize> >(poly);
// Check state of Ostream
diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict
index 1a53982f79cea013dde434fa21ca0fa010e4ec5e..bde8b0b38a8b03966a0d2dab18d7ed000cadf67a 100644
--- a/src/conversion/meshTables/remappingDict
+++ b/src/conversion/meshTables/remappingDict
@@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | |
-| \\/ M anipulation | www.OpenFOAM.org |
+| \\ / O peration | Version: 1.5.x |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 0db23c7ed63d6fc146230c7b9262d389fdb640b3..1332d90fd4bdab5cb3168c854f777a9d01ea5b49 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -1640,16 +1640,4 @@ Foam::polyDualMesh::~polyDualMesh()
{}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
index a1d74268f90d8ba9db44cddc03b8f70316bc776b..0247f263896954720494026cdbef057db8f4b66c 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.H
@@ -111,7 +111,7 @@ protected:
const PtrList<volScalarField>& carrierFields_;
//- Active flag
- bool active_;
+ Switch active_;
//- List of point source properties
List<pointSourceProperties> pointSources_;
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
index f13e344375efb3cd476a9263a643ada04fcd78a4..34e85c2e272eb3a48c93cace73178ba5fccc17b6 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C
@@ -370,6 +370,12 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const
<< indent << token::BEGIN_BLOCK << incrIndent << nl;
}
+ if (dict_.found("note"))
+ {
+ os.writeKeyword("note") << string(dict_.lookup("note"))
+ << token::END_STATEMENT << nl;
+ }
+
coordSys_.writeDict(os, true);
if (dict_.found("porosity"))
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index b6ab574d1db86efb7a7127f572613ddfa49f7d3a..3280fefdc93939812cb05681d24f480510b66fdf 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -67,6 +67,7 @@ Foam::spray::spray
time0_(runTime_.value()),
mesh_(U.mesh()),
rndGen_(label(0)),
+ g_(g.value()),
U_(U),
rho_(rho),
@@ -181,7 +182,6 @@ Foam::spray::spray
),
subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
- g_(g.value()),
gasProperties_(gasProperties),
composition_(composition),
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 27ec6a43ec4e4bcce0ec5f5659d101e4a18f539d..60127656e73dde45f4954dd690a053567af9f904 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -79,6 +79,9 @@ class spray
//- Random number generator
Random rndGen_;
+ //- Acceleration due to gravity
+ const vector& g_;
+
// References to the physical fields
@@ -93,14 +96,14 @@ class spray
//- Ambient Pressure
- scalar ambientPressure_;
+ scalar ambientPressure_;
//- Ambient Temperature
- scalar ambientTemperature_;
+ scalar ambientTemperature_;
//- The injectors
- IOPtrList<injector> injectors_;
+ IOPtrList<injector> injectors_;
// References to the spray sub-models
@@ -121,10 +124,6 @@ class spray
const label subCycles_;
- //- Acceleration due to gravity
- const vector& g_;
-
-
// Composition properties
const PtrList<gasThermoPhysics>& gasProperties_;
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index e473102c1a9084fd87e0794aa55d843c80604432..650cb7ddcbdc9f47bb7ca2782d67d99e0d743a84 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -249,10 +249,10 @@ template<class ParcelType>
void Foam::KinematicCloud<ParcelType>::info() const
{
Info<< "Cloud: " << this->name() << nl
- << " Parcels added during this run = "
+ << " Total number of parcels added = "
<< returnReduce(this->injection().parcelsAddedTotal(), sumOp<label>())
<< nl
- << " Mass introduced during this run = "
+ << " Total mass introduced = "
<< returnReduce(this->injection().massInjected(), sumOp<scalar>())
<< nl
<< " Current number of parcels = "
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
index 2fbe3815c949047e11488f75992d8fdf6b078289..5124bbfb9712e7e3d240e08f8a41c0645de62f9e 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
index 4cbe6f69177f1d826467a7629606e027d40b5db2..acac7fd1484ea02645191b43fde859977c1e689a 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index b1733762e5994e12e9574d6d03c0dc552180fd2f..8d388e6d6692b86d40f297bdc67397b1afc6ad42 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -298,7 +298,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
dt,
cellI,
d,
- T,
+ min(T, td.constProps().Tbp()), // Limit to boiling temperature
pc_,
this->Tc_,
this->muc_/(this->rhoc_ + ROOTVSMALL),
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 8e351f96f098362f9532da369751e16ced11bcbe..f17cd211714c23e918d766d2e66555cc2bb986e5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -91,6 +91,9 @@ public:
//- Vaporisation temperature [K]
const scalar Tvap_;
+ //- Boiling point [K]
+ const scalar Tbp_;
+
public:
@@ -107,7 +110,10 @@ public:
//- Return const access to the vaporisation temperature
inline scalar Tvap() const;
- };
+
+ //- Return const access to the boiling point
+ inline scalar Tbp() const;
+ };
//- Class used to pass reacting tracking data to the trackToFace function
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 5c2b3c7b2d4b0fb885052120a4eec448831e01d7..55aa90eb7e5547b97d7d37b68764eb5e3c80980c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -35,7 +35,8 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
ThermoParcel<ParcelType>::constantProperties(parentDict),
pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
constantVolume_(this->dict().lookup("constantVolume")),
- Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
+ Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()),
+ Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value())
{}
@@ -145,6 +146,14 @@ Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
}
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::Tbp() const
+{
+ return Tbp_;
+}
+
+
// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
template<class ParcelType>
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
index 276d54146be209caa8c656b964e388547940330e..6726b8c55f9d449f06bac1230931d17a6ea28669 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index 6d3cd51f65fddea75f11082b43297873f6113c27..ccebe5f994d99e198d704e6cd281df4b6d195efe 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
index 05c34b645fc696abd1a6ed7c82e27683a9175508..6b40fd800492c4b09620a9e83ae39485c354bef9 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
index fb463a8289e69b43508b45e5c9e4d9a35e9d3729..010ae252effc078bfc808fc8de35d88c3c91882d 100644
--- a/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
+++ b/src/lagrangian/intermediate/submodels/IO/IOList/makeParcelIOList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 7c63f1c26247550d6bc388c3a6a229b513bbde9d..42134dcdeddd0165892180182f72211cd61f4ffd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -186,7 +186,6 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
(
const label parcels,
const scalar volume,
- const scalar volumeFraction,
const scalar diameter,
const scalar rho
)
@@ -196,13 +195,14 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
{
case pbMass:
{
- nP = volumeFraction*massTotal_/parcels
- /(rho*mathematicalConstant::pi/6.0*pow3(diameter));
+ nP = volume/volumeTotal_
+ *massTotal_/rho
+ /(parcels*mathematicalConstant::pi/6.0*pow3(diameter));
break;
}
case pbNumber:
{
- nP = volumeFraction*massTotal_/(rho*volume);
+ nP = massTotal_/(rho*volumeTotal_*parcels);
break;
}
default:
@@ -363,9 +363,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
return;
}
- // Volume fraction to introduce during this timestep
- const scalar volFraction = volumeFraction(newVolume);
-
// Duration of injection period during this timestep
const scalar deltaT =
max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
@@ -418,7 +415,6 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
(
newParcels,
newVolume,
- volFraction,
pPtr->d(),
pPtr->rho()
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ad42a27030e37baee82f64915a558b2ce0392753..dc3b9ff61b2661400ea7c4919e5ca7f183359f20 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -113,8 +113,8 @@ protected:
//- Start of injection [s]
const scalar SOI_;
- //- Total volume of parcels to introduce [m^3]
- // Initialised in the individual injection models
+ //- Total volume of particles introduced by this injector [m^3]
+ // - scaled to ensure massTotal is achieved
scalar volumeTotal_;
//- Total mass to inject [kg]
@@ -183,7 +183,6 @@ protected:
(
const label parcels,
const scalar volume,
- const scalar volumeFraction,
const scalar diameter,
const scalar rho
);
@@ -290,9 +289,6 @@ public:
template<class TrackData>
void inject(TrackData& td);
- //- Return the volume fraction to introduce
- inline scalar volumeFraction(const scalar volume) const;
-
// Injection geometry
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
index 80a142816c826fa03984fee7c502c063280a84c5..716208c09266b15d80daf1ce582941519e57dce8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
@@ -96,14 +96,4 @@ Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const
}
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction
-(
- const scalar volume
-) const
-{
- return volume/volumeTotal_;
-}
-
-
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 19429ba6817e94bdaab43a832c7d1494c0a99638..91274c245824fa7d76bd5caa3f43f8d77a49a129 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 7e569736cab10d9dbb4dac3f464f9a5abbf2a22d..6f0bf06c4b6387202d42aa66ae90988a5bf0c41e 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index ee3779b22ec64d22ad28d3cdf935a7fe641aece1..32a0c449eaed93fe6666ec5d5d0d4520a54dcc68 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 007fa73344ff48732e4dd396c97b8bb131c8e53c..3b6effa40292cbf645fb3ad174941b5ed165d25a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
index efb611522a8ce744d28f0033029d58f309e5bbfa..3b317c5b056a101e87da0e7c8ed22f8e6fe5261f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index b9fbdb2011463904670d4e98a912c75fe273d08c..c60f1bf903871b32a9a6602f56e0267334c0ae5d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 2e0f03a3f52510fb46a661246636c0cad340bbc8..7445ea6264ca0d8d31dd69d9769d0ad109338701 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index a69dce41b7d613e1d2032e0ed393d57fcfec9545..4e59e8a30bc07833f2a447ebb3454437863aaf60 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -63,22 +63,23 @@ void Foam::fieldAverage::addMeanField
const fieldType& baseField =
obr_.lookupObject<fieldType>(fieldName);
- fieldType* fPtr = new fieldType
+ // Store on registry
+ obr_.store
(
- IOobject
+ new fieldType
(
- meanFieldName,
- obr_.time().timeName(),
- obr_,
- IOobject::READ_IF_PRESENT,
- IOobject::NO_WRITE
- ),
- baseField
+ IOobject
+ (
+ meanFieldName,
+ obr_.time().timeName(),
+ obr_,
+ IOobject::READ_IF_PRESENT,
+ IOobject::NO_WRITE
+ ),
+ 1*baseField
+ )
);
- // Store on registry
- fPtr->store();
-
meanFieldList[fieldI] = meanFieldName;
}
}
@@ -121,22 +122,22 @@ void Foam::fieldAverage::addPrime2MeanField
const fieldType1& meanField =
obr_.lookupObject<fieldType1>(meanFieldList[fieldI]);
- fieldType2* fPtr = new fieldType2
+ obr_.store
(
- IOobject
+ new fieldType2
(
- meanFieldName,
- obr_.time().timeName(),
- obr_,
- IOobject::READ_IF_PRESENT,
- IOobject::NO_WRITE
- ),
- sqr(baseField) - sqr(meanField)
+ IOobject
+ (
+ meanFieldName,
+ obr_.time().timeName(),
+ obr_,
+ IOobject::READ_IF_PRESENT,
+ IOobject::NO_WRITE
+ ),
+ sqr(baseField) - sqr(meanField)
+ )
);
- // Store on registry
- fPtr->store();
-
prime2MeanFieldList[fieldI] = meanFieldName;
}
}
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
index abe193ce73a1519eb2e8956e1a1a8a04f03bcb09..37a40ebaae65c6e756b93a729c5c4009e13a6917 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
@@ -26,13 +26,9 @@ License
#include "MeshedSurfaceIOAllocator.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
Foam::MeshedSurfaceIOAllocator::MeshedSurfaceIOAllocator
(
const IOobject& ioPoints,
diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
index d3b6d5ff6a9f9aacb47224259632effa4bdc39d6..3e9eec778fedff5c17d176bd2168acf19ca4f451 100644
--- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
+++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H
@@ -63,6 +63,7 @@ class MeshedSurfaceIOAllocator
//- Surface zones
surfZoneIOList zones_;
+
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -71,6 +72,7 @@ class MeshedSurfaceIOAllocator
//- Disallow default bitwise assignment
void operator=(const MeshedSurfaceIOAllocator&);
+
public:
// Constructors
@@ -179,7 +181,6 @@ public:
const Xfer< faceList >& faces,
const Xfer< surfZoneList >& zones
);
-
};
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index d9ba96704b8ce4dd5a3ab578517c736585ca8d7a..3eb0c9e40db3297535aad32091daac70ecfb9eba 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -216,7 +216,6 @@ void Foam::MeshedSurfaceProxy<Face>::write
}
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -242,20 +241,4 @@ Foam::MeshedSurfaceProxy<Face>::~MeshedSurfaceProxy()
{}
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 64fc7c4fcd39cc2aee4e6ad6888959a7eb5fa0ec..776c68372f5d5d27a79d38ac4a597da04c42e180 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -76,13 +76,14 @@ class MeshedSurfaceProxy
const List<label>& faceMap_;
+
public:
+ // Static
+
//- Runtime type information
ClassName("MeshedSurfaceProxy");
- // Static
-
//- The file format types that can be written via MeshedSurfaceProxy
static wordHashSet writeTypes();
@@ -101,6 +102,7 @@ public:
const List<label>& faceMap = List<label>()
);
+
// Destructor
virtual ~MeshedSurfaceProxy();
@@ -127,53 +129,50 @@ public:
// Member Functions
- // Access
-
- //- Return const access to the points
- inline const pointField& points() const
- {
- return points_;
- }
-
- //- Return const access to the faces
- inline const List<Face>& faces() const
- {
- return faces_;
- }
-
- //- Const access to the surface zones.
- // If zones are defined, they must be contiguous and cover the entire
- // surface.
- inline const List<surfZone>& surfZones() const
- {
- return zones_;
- }
-
- //- Const access to the faceMap, zero-sized when unused
- inline const List<label>& faceMap() const
- {
- return faceMap_;
- }
-
- //- Use faceMap?
- inline bool useFaceMap() const
- {
- return faceMap_.size() == faces_.size();
- }
-
- // Write
-
- //- Generic write routine. Chooses writer based on extension.
- virtual void write(const fileName& name) const
- {
- write(name, *this);
- }
-
- //- Write to database
- virtual void write(const Time&, const word& surfName = "") const;
-
- //?? void writeStats(Ostream& os) const;
-
+ // Access
+
+ //- Return const access to the points
+ inline const pointField& points() const
+ {
+ return points_;
+ }
+
+ //- Return const access to the faces
+ inline const List<Face>& faces() const
+ {
+ return faces_;
+ }
+
+ //- Const access to the surface zones.
+ // If zones are defined, they must be contiguous and cover the
+ // entire surface
+ inline const List<surfZone>& surfZones() const
+ {
+ return zones_;
+ }
+
+ //- Const access to the faceMap, zero-sized when unused
+ inline const List<label>& faceMap() const
+ {
+ return faceMap_;
+ }
+
+ //- Use faceMap?
+ inline bool useFaceMap() const
+ {
+ return faceMap_.size() == faces_.size();
+ }
+
+ // Write
+
+ //- Generic write routine. Chooses writer based on extension.
+ virtual void write(const fileName& name) const
+ {
+ write(name, *this);
+ }
+
+ //- Write to database
+ virtual void write(const Time&, const word& surfName = "") const;
};
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 881f73ebae3b2cdcd1be8da080c92caeca0b323a..98397284b96ee81fb770788d48f595876a5aa07e 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -33,8 +33,6 @@ License
#include "polyBoundaryMesh.H"
#include "polyMesh.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
template<class Face>
@@ -301,10 +299,6 @@ Foam::UnsortedMeshedSurface<Face>::~UnsortedMeshedSurface()
{}
-// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-
-
-
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class Face>
@@ -694,7 +688,6 @@ Foam::UnsortedMeshedSurface<Face>::xfer()
}
-
// Read from file, determine format from extension
template<class Face>
bool Foam::UnsortedMeshedSurface<Face>::read(const fileName& name)
@@ -773,11 +766,6 @@ Foam::MeshedSurfaceProxy<Face>() const
}
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "UnsortedMeshedSurfaceNew.C"
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 7a272240d15a50abbcb0842878779bdf024e9ec8..bb4fa01b379a3080bb8a75459a7eb569073ce6bc 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -91,6 +91,7 @@ private:
typedef MeshedSurface<Face> FriendType;
typedef MeshedSurfaceProxy<Face> ProxyType;
+
// Private Member Data
//- The zone Id associated with each face
@@ -100,6 +101,7 @@ private:
// during reading and writing)
List<surfZoneIdentifier> zoneToc_;
+
// Private member functions
//- Disable resize with value
@@ -111,6 +113,7 @@ private:
//- Read OpenFOAM Surface format
bool read(Istream&);
+
protected:
// Protected Member functions
@@ -130,11 +133,13 @@ protected:
//- Set new zones from faceMap
virtual void remapFaces(const UList<label>& faceMap);
+
public:
//- Runtime type information
TypeName("UnsortedMeshedSurface");
+
// Static
//- Can we read this file format?
@@ -149,6 +154,7 @@ public:
static wordHashSet readTypes();
static wordHashSet writeTypes();
+
// Constructors
//- Construct null
@@ -198,6 +204,7 @@ public:
//- Construct from objectRegistry and a named surface
UnsortedMeshedSurface(const Time&, const word& surfName="");
+
// Declare run-time constructor selection table
declareRunTimeSelectionTable
@@ -211,6 +218,7 @@ public:
(name)
);
+
// Selectors
//- Select constructed from filename (explicit extension)
@@ -223,6 +231,7 @@ public:
//- Select constructed from filename (implicit extension)
static autoPtr<UnsortedMeshedSurface> New(const fileName&);
+
// Destructor
virtual ~UnsortedMeshedSurface();
@@ -249,120 +258,119 @@ public:
// Member Functions
- // Access
+ // Access
- //- The surface size is the number of faces
- label size() const
- {
- return ParentType::size();
- }
+ //- The surface size is the number of faces
+ label size() const
+ {
+ return ParentType::size();
+ }
- //- Reset size of face and zone list
- void setSize(const label);
+ //- Reset size of face and zone list
+ void setSize(const label);
- //- Return const access to the zone ids
- const List<label>& zoneIds() const
- {
- return zoneIds_;
- }
+ //- Return const access to the zone ids
+ const List<label>& zoneIds() const
+ {
+ return zoneIds_;
+ }
- //- Return const access to the zone table-of-contents
- const List<surfZoneIdentifier>& zoneToc() const
- {
- return zoneToc_;
- }
+ //- Return const access to the zone table-of-contents
+ const List<surfZoneIdentifier>& zoneToc() const
+ {
+ return zoneToc_;
+ }
- //- Sort faces according to zoneIds
- // Returns a surfZoneList and sets faceMap to index within faces()
- surfZoneList sortedZones(labelList& faceMap) const;
+ //- Sort faces according to zoneIds
+ // Returns a surfZoneList and sets faceMap to index within faces()
+ surfZoneList sortedZones(labelList& faceMap) const;
- //- Set zones to 0 and set a single zone
- void setOneZone();
+ //- Set zones to 0 and set a single zone
+ void setOneZone();
- //- Set zone ids and zones
- void setZones(const surfZoneList&);
+ //- Set zone ids and zones
+ void setZones(const surfZoneList&);
- //- Set zone ids and zones
- void setZones(const UList<label>& sizes, const UList<word>& names);
+ //- Set zone ids and zones
+ void setZones(const UList<label>& sizes, const UList<word>& names);
- //- Set zone ids and zones with default names
- void setZones(const UList<label>& sizes);
+ //- Set zone ids and zones with default names
+ void setZones(const UList<label>& sizes);
- // Edit
+ // Edit
- //- Clear all storage
- virtual void clear();
+ //- Clear all storage
+ virtual void clear();
- //- Return new surface.
- // Returns return pointMap, faceMap from subsetMeshMap
- UnsortedMeshedSurface subsetMesh
- (
- const labelHashSet& include,
- labelList& pointMap,
- labelList& faceMap
- ) const;
-
- //- Return new surface.
- UnsortedMeshedSurface subsetMesh
- (
- const labelHashSet& include
- ) const;
+ //- Return new surface.
+ // Returns return pointMap, faceMap from subsetMeshMap
+ UnsortedMeshedSurface subsetMesh
+ (
+ const labelHashSet& include,
+ labelList& pointMap,
+ labelList& faceMap
+ ) const;
- //- Transfer components (points, faces, zone ids).
- virtual void reset
- (
- const Xfer< pointField >&,
- const Xfer< List<Face> >&,
- const Xfer< List<label> >& zoneIds
- );
+ //- Return new surface.
+ UnsortedMeshedSurface subsetMesh
+ (
+ const labelHashSet& include
+ ) const;
- //- Transfer components (points, faces, zone ids).
- virtual void reset
- (
- const Xfer< List<point> >&,
- const Xfer< List<Face> >&,
- const Xfer< List<label> >& zoneIds
- );
+ //- Transfer components (points, faces, zone ids).
+ virtual void reset
+ (
+ const Xfer< pointField >&,
+ const Xfer< List<Face> >&,
+ const Xfer< List<label> >& zoneIds
+ );
- //- Transfer the contents of the argument and annull the argument
- void transfer(UnsortedMeshedSurface<Face>&);
+ //- Transfer components (points, faces, zone ids).
+ virtual void reset
+ (
+ const Xfer< List<point> >&,
+ const Xfer< List<Face> >&,
+ const Xfer< List<label> >& zoneIds
+ );
- //- Transfer the contents of the argument and annull the argument
- void transfer(MeshedSurface<Face>&);
+ //- Transfer the contents of the argument and annull the argument
+ void transfer(UnsortedMeshedSurface<Face>&);
- //- Transfer contents to the Xfer container
- Xfer< UnsortedMeshedSurface<Face> > xfer();
+ //- Transfer the contents of the argument and annull the argument
+ void transfer(MeshedSurface<Face>&);
+ //- Transfer contents to the Xfer container
+ Xfer< UnsortedMeshedSurface<Face> > xfer();
- // Read
- //- Read from file. Chooses reader based on explicit extension
- bool read(const fileName&, const word& ext);
+ // Read
- //- Read from file. Chooses reader based on detected extension
- virtual bool read(const fileName&);
+ //- Read from file. Chooses reader based on explicit extension
+ bool read(const fileName&, const word& ext);
+ //- Read from file. Chooses reader based on detected extension
+ virtual bool read(const fileName&);
- // Write
- //- Generic write routine. Chooses writer based on extension.
- virtual void write(const fileName& name) const
- {
- write(name, *this);
- }
+ // Write
- //- Write to database
- void write(const Time&, const word& surfName="") const;
+ //- Generic write routine. Chooses writer based on extension.
+ virtual void write(const fileName& name) const
+ {
+ write(name, *this);
+ }
+ //- Write to database
+ void write(const Time&, const word& surfName="") const;
- // Member operators
- void operator=(const UnsortedMeshedSurface<Face>&);
+ // Member operators
- //- Conversion operator to MeshedSurfaceProxy
- operator MeshedSurfaceProxy<Face>() const;
+ void operator=(const UnsortedMeshedSurface<Face>&);
+ //- Conversion operator to MeshedSurfaceProxy
+ operator MeshedSurfaceProxy<Face>() const;
};
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index 222acc40558d4c4c28414fdc1ec8c40919373390..44f4dcd4de3025523dd537b7df9ef9ac8397f68a 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -28,7 +28,6 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
template<class Face>
Foam::autoPtr< Foam::UnsortedMeshedSurface<Face> >
Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
@@ -68,7 +67,7 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
"(const fileName&, const word&) : "
"constructing UnsortedMeshedSurface"
) << "Unknown file extension " << ext << nl << nl
- << "Valid types are :" << nl
+ << "Valid types are:" << nl
<< supported
<< exit(FatalError);
}
@@ -90,4 +89,5 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name)
return New(name, ext);
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
index dabde60b7afdb9f2688d166baba9b41a7b1188ad..331b8e583d5998e32239a4fb323b2e232dbfca79 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H
@@ -31,6 +31,8 @@ License
namespace Foam
{
+
+// Forward declaration of classes
class face;
class triFace;
diff --git a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
index 8ced148e4fd3d73e16566c5453a39af5a7dceae5..246d5f1cff9bf25f0e9d58cc5ad79bc35f06372b 100644
--- a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
+++ b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H
@@ -76,7 +76,6 @@ public:
{
return size(mesh_);
}
-
};
diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
index 188b3dd6bda406d8e4cdce313c2eb2f55706f3f3..4565908a9cd6cf09935a97130cd65d4dfa98ac12 100644
--- a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
+++ b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H
@@ -76,7 +76,6 @@ public:
{
return size(mesh_);
}
-
};
diff --git a/src/surfMesh/surfMesh/surfMesh.C b/src/surfMesh/surfMesh/surfMesh.C
index 1f2d35a54f13772f852b367668ec007b0ff48236..71f6fd82c463d81f3b92f72afd200d015fbeab10 100644
--- a/src/surfMesh/surfMesh/surfMesh.C
+++ b/src/surfMesh/surfMesh/surfMesh.C
@@ -70,7 +70,6 @@ Foam::word Foam::surfMesh::meshSubDir = "surfMesh";
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
Foam::surfMesh::surfMesh(const IOobject& io, const word& surfName)
:
surfaceRegistry(io.db(), (surfName.size() ? surfName : io.name())),
@@ -215,6 +214,7 @@ Foam::surfMesh::surfMesh
}
}
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfMesh::~surfMesh()
@@ -271,7 +271,6 @@ void Foam::surfMesh::resetPrimitives
}
-
void Foam::surfMesh::transfer
(
MeshedSurface<face>& surf
@@ -330,21 +329,25 @@ Foam::label Foam::surfMesh::nPoints() const
return this->points().size();
}
+
Foam::label Foam::surfMesh::nFaces() const
{
return this->faces().size();
}
+
const Foam::pointField& Foam::surfMesh::points() const
{
return this->storedIOPoints();
}
+
const Foam::faceList& Foam::surfMesh::faces() const
{
return this->storedIOFaces();
}
+
void Foam::surfMesh::checkZones()
{
// extra safety, ensure we have at some zones
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 234971788a1409cfa8330130b5b675deac0b6bb9..3215bfd345ae767a0a81d96a8128972f1bd40e98 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -96,9 +96,6 @@ private:
MeshReference;
- // Permanent data
-
-
// Private member functions
//- Disallow construct as copy
@@ -107,6 +104,7 @@ private:
//- Disallow default bitwise assignment
void operator=(const surfMesh&);
+
protected:
// Protected Member Functions
@@ -129,7 +127,6 @@ protected:
return Allocator::storedIOZones();
}
-
//- Update references to storedFaces
virtual void updateFacesRef();
@@ -139,6 +136,7 @@ protected:
//- Update references to storedPoints/storedFaces
virtual void updateRefs();
+
public:
// Public typedefs
@@ -178,6 +176,7 @@ public:
const word& surfName=""
);
+
// Destructor
virtual ~surfMesh();
diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C
index f9c44dc8ba40c3070bc91b52a85750fabe8fc336..c74b1c693eb5ae9fae13f00ca9948801da540707 100644
--- a/src/surfMesh/surfMesh/surfMeshIO.C
+++ b/src/surfMesh/surfMesh/surfMeshIO.C
@@ -203,6 +203,4 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate()
}
-
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C
index b10d1737c60ee6510611cac356552ed94be88b10..3551a86fbdf0f42bbabeddbff96fbc23abfa0ab4 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.C
+++ b/src/surfMesh/surfZone/surfZone/surfZone.C
@@ -45,7 +45,6 @@ Foam::surfZone::surfZone()
{}
-
Foam::surfZone::surfZone
(
const word& name,
diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H
index f5ea6ec1fa329e4114787ad15a08210d949b2305..bfe6be604c8e4c9b7c146658c979dddc96ec27cf 100644
--- a/src/surfMesh/surfZone/surfZone/surfZone.H
+++ b/src/surfMesh/surfZone/surfZone/surfZone.H
@@ -73,6 +73,7 @@ class surfZone
//- Start label of this group in the face list
label start_;
+
public:
//- Runtime type information
@@ -167,6 +168,7 @@ public:
//- compare.
bool operator==(const surfZone&) const;
+
// IOstream Operators
friend Istream& operator>>(Istream&, surfZone&);
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
index 0cda4e3069024e713e5d044aaac24e19df824d3c..3cd8b112bfcce028f575972fd97c75197dfb2ae0 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C
@@ -153,9 +153,4 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIOList& L)
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
index a386f65fabe03f15e2501b62b80a7506f65bb436..268cbd1aa790b91d1f0bf780d7f3f0ce16a78273 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
@@ -57,9 +57,6 @@ class surfZoneIOList
public surfZoneList,
public regIOobject
{
- // Private data
-
-
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -86,6 +83,7 @@ public:
//- Construct from IOobject and surfZoneList
surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
+
// Destructor
~surfZoneIOList();
@@ -97,12 +95,6 @@ public:
bool writeData(Ostream&) const;
- // Member Operators
-
- // Friend Functions
-
- // Friend Operators
-
// IOstream Operators
friend Ostream& operator<<(Ostream&, const surfZoneIOList&);
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
index 1149bfded33e13c4273119e36374a68cb796a92b..67fc51f5ec3c4109bbbec0b7c8db2f29f4ad8ce0 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C
@@ -27,8 +27,6 @@ License
#include "surfZoneIdentifier.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::surfZoneIdentifier::surfZoneIdentifier()
@@ -77,6 +75,7 @@ Foam::surfZoneIdentifier::surfZoneIdentifier
geometricType_(p.geometricType())
{}
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::surfZoneIdentifier::~surfZoneIdentifier()
@@ -136,4 +135,5 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIdentifier& p)
return os;
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
index 7b87c3dd30b06434e575884c2b5415606b672846..a2576bc392f1ef9923bb84d391eb4099fdec3bad 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
@@ -72,6 +72,7 @@ class surfZoneIdentifier
//- Type name of zone
mutable word geometricType_;
+
public:
// Constructors
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 13066c9f67f7cf128e7e60e7f5c56345520a07cb..f7c63278f5868291ac1be28610b0b4b4eb3228fd 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -30,11 +30,6 @@ License
#include "tensor.H"
#include "primitivePatch.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -46,6 +41,7 @@ Foam::fileFormats::AC3DsurfaceFormat<Face>::AC3DsurfaceFormat
read(filename);
}
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index 03345382208c285079561a90335d0f2f9bf91727..52f5ba16205faaccbbd86fe40f4017f881ba640d 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -73,6 +73,7 @@ class AC3DsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const AC3DsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -80,6 +81,7 @@ public:
//- Construct from file name
AC3DsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -91,6 +93,7 @@ public:
);
}
+
// Destructor
virtual ~AC3DsurfaceFormat()
@@ -105,7 +108,6 @@ public:
//- Write UnsortedMeshedSurface, the output is always sorted by zones.
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -114,7 +116,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
index ef2860cd3cc8bbb8bf50b35c1a7ba40bd19bed69..54068ce85de3532a88fd6fcf419680e000575eba 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.C
@@ -29,8 +29,6 @@ License
#include "IFstream.H"
#include "IStringStream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::fileFormats::AC3DsurfaceFormatCore::readCmd
@@ -156,6 +154,5 @@ void Foam::fileFormats::AC3DsurfaceFormatCore::writeHeader
<< "kids " << zoneLst.size() << endl;
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
index 1c3e5dc82865f9da08b5af3dfad04996ee1ec76f..c210db4ccc60e1ccd1f5fecfabd75d6e010bf142 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCore.H
@@ -55,30 +55,30 @@ namespace fileFormats
class AC3DsurfaceFormatCore
{
protected:
- // Protected Member Functions
- //- Read a type via IStringStream
- template<class Type>
- static Type parse(const string&);
+ // Protected Member Functions
- //- Read cmd, args from IFstream
- static bool readCmd(IFstream&, string& cmd, string& args);
+ //- Read a type via IStringStream
+ template<class Type>
+ static Type parse(const string&);
- //- Cue up to cmd, reading args
- static bool cueTo(IFstream&, const string& cmd, string& args);
+ //- Read cmd, args from IFstream
+ static bool readCmd(IFstream&, string& cmd, string& args);
- //- Cue up to cmd, reading args or exit with a FatalError
- // returns the command args
- static string cueToOrDie
- (
- IFstream&,
- const string& cmd,
- const string& errorMsg=string::null
- );
+ //- Cue up to cmd, reading args
+ static bool cueTo(IFstream&, const string& cmd, string& args);
- //- Write header with materials
- static void writeHeader(Ostream&, const UList<surfZone>&);
+ //- Cue up to cmd, reading args or exit with a FatalError
+ // returns the command args
+ static string cueToOrDie
+ (
+ IFstream&,
+ const string& cmd,
+ const string& errorMsg=string::null
+ );
+ //- Write header with materials
+ static void writeHeader(Ostream&, const UList<surfZone>&);
};
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
index 572d8455f7e94bd9edd03937dc1679e964f2fed7..13a5b65fb85abfb350db9a443e5aeb2bcd290d32 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatCoreTemplates.C
@@ -39,6 +39,5 @@ Type Foam::fileFormats::AC3DsurfaceFormatCore::parse(const string& s)
return t;
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
index 05bf9d0ffa1f69efb74075673dc117eb329ad595..268078df0951ca9c1352e63db9bf717f88fbef0c 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
index 372427f4ad2ded54b02ae7e97f2d4da5a0f4a9d1..d0ccd5a66f1adf0d5c7d37c28c47c4a604a9ad5f 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.C
@@ -28,8 +28,6 @@ License
#include "Keyed.H"
#include "IFstream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -101,4 +99,5 @@ bool Foam::fileFormats::FTRsurfaceFormat<Face>::read
return true;
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index 25883d4eb3e8ea00d470b31e1a025e87e9882aa9..767bf19707e11f862cb54cda49f08af05c1bc5bb 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -82,6 +82,7 @@ class FTRsurfaceFormat
}
};
+
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -90,6 +91,7 @@ class FTRsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const FTRsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -97,6 +99,7 @@ public:
//- Construct from file name
FTRsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -119,7 +122,6 @@ public:
//- Read from file
virtual bool read(const fileName&);
-
};
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
index e52c952b9d05a01b762e998e06f1eb4b1626066a..58e28e1169ac395d304771420900b21aab2cac1e 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index a8b70d864eb5a27add5ac582fd54f909422fd9bc..86fbd61cd9758c80d0baa58ba383f15daf444941 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -32,10 +32,6 @@ License
#include "Ostream.H"
#include "OFstream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
index 91ef7227c72455e41e9174f3e7ca562508a89bfc..49711abac4255a001a2ded1c32b7d32e0a073ed3 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.H
@@ -66,6 +66,7 @@ class GTSsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const GTSsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -73,6 +74,7 @@ public:
//- Construct from file name
GTSsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -84,9 +86,11 @@ public:
);
}
- // Destructor
- virtual ~GTSsurfaceFormat()
- {}
+
+ //- Destructor
+ virtual ~GTSsurfaceFormat()
+ {}
+
// Member Functions
@@ -96,7 +100,6 @@ public:
//- Write UnsortedMeshedSurface, the output remains unsorted
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -105,7 +108,6 @@ public:
{
write(name, *this);
}
-
};
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
index d3268962d25fef310e97a3ebb3c8e09d43fff6ea..5cc1fa2af06648ba4b9bcc5d91db846035ea24dd 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 4933afa9d490ed3bcd5eed8be48ebddac2654779..092b0696cd940fd7568a753f17c80a5dada0ffa0 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -28,11 +28,6 @@ License
#include "IFstream.H"
#include "IStringStream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -393,4 +388,5 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
return true;
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 46ea1e59c39a1fd524f98b45a4271b4c1e09e8dd..bf57a568a5e74b5fd0bd9943819388840bfeaea0 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -74,6 +74,7 @@ class NASsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const NASsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -81,6 +82,7 @@ public:
//- Construct from file name
NASsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -92,16 +94,17 @@ public:
);
}
+
// Destructor
virtual ~NASsurfaceFormat()
{}
+
// Member Functions
//- Read from a file
virtual bool read(const fileName&);
-
};
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
index af182980ba6539f4ca50b04812de78801e152e21..97b6a9ae4057eca52bf6823c0ee4d29c4be97817 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
#include "NASsurfaceFormatCore.H"
#include "IStringStream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Do weird things to extract a floating point number
@@ -56,7 +54,5 @@ Foam::scalar Foam::fileFormats::NASsurfaceFormatCore::parseNASCoord
}
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
index b9a350043271d8bf1f9d406540cf97dfcae989bc..2c7b32d781450a50123d01d5a971fe9eee438723 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatCore.H
@@ -53,11 +53,11 @@ namespace fileFormats
class NASsurfaceFormatCore
{
protected:
- // Protected Member Functions
- //- Do weird things to extract number
- static scalar parseNASCoord(const string&);
+ // Protected Member Functions
+ //- Do weird things to extract number
+ static scalar parseNASCoord(const string&);
};
@@ -68,8 +68,6 @@ protected:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
index 7bebc54830ff0707c1eb840b116afd86eb81831a..ac79c54358ca8b9d56bff98bc34b8ed5d6afe477 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 47ae2122eb2b99664b12349b1049212b7391c171..df10f47d43d51c3e6074e92d66bccfc8131da177 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -32,8 +32,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index 424074b0f079cc11f45dd7f1e224e7dc77de6ffe..2489d2f98812599da837f2942e143afa7a59ae05 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -66,6 +66,7 @@ class OBJsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OBJsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -73,6 +74,7 @@ public:
//- Construct from file name
OBJsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -84,6 +86,7 @@ public:
);
}
+
// Destructor
virtual ~OBJsurfaceFormat()
@@ -103,7 +106,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
index 6c6789a3ad3439178a40201a34ad3063157949ca..509b70ebb46a0d3dab2120d6797fa2302b8ac503 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index 531e599f250a795fe591446b464a43782397d988..bb423f5dddcfea98fb292331492affbda5b3ff8d 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -31,10 +31,6 @@ License
#include "Ostream.H"
#include "OFstream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -214,7 +210,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
{
os << "# <zone name=\"" << zoneLst[zoneI].name() << "\">" << endl;
- if (surf.useFaceMap())
+ if (surf.useFaceMap())
{
forAll(zoneLst[zoneI], localFaceI)
{
@@ -245,7 +241,7 @@ void Foam::fileFormats::OFFsurfaceFormat<Face>::write
// add optional zone information
os << ' ' << zoneI << endl;
}
- }
+ }
os << "# </zone>" << endl;
}
os << "# </faces>" << endl;
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
index bc3f608addd0e0288fdfb42be8a9995a163707e7..c627ce38a88c6e2a8e75946c727cb2e699ea8726 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.H
@@ -74,6 +74,7 @@ class OFFsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OFFsurfaceFormat&);
+
public:
// Constructors
@@ -81,6 +82,7 @@ public:
//- Construct from file name
OFFsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -92,16 +94,17 @@ public:
);
}
- // Destructor
- virtual ~OFFsurfaceFormat()
- {}
+
+ //- Destructor
+ virtual ~OFFsurfaceFormat()
+ {}
+
// Member Functions
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -110,7 +113,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
index 5989f60bf0803550586e5fc5dfdbb67c160436b5..6cde8cbdbb9941e29dc6057c3dfcb09052e19381 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
index 3368ff3138938ed83ca06a861b2df661e281aad8..1df692c528e72b5e5f191d7859896b1a5e25805b 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.C
@@ -29,8 +29,6 @@ License
#include "IStringStream.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -257,4 +255,5 @@ void Foam::fileFormats::OFSsurfaceFormat<Face>::write
os.check("OFSsurfaceFormat<Face>::write(Ostream&)");
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index e550d04e7d192474167900982279d7484c81e5d2..5ca5ebd1c44bbf193b1972173fa66ad80eea992e 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -71,6 +71,7 @@ class OFSsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const OFSsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -78,6 +79,7 @@ public:
//- Construct from file name
OFSsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -89,12 +91,14 @@ public:
);
}
+
// Destructor
virtual ~OFSsurfaceFormat()
{}
+
// Member Functions
//- Read surface mesh components
@@ -124,7 +128,6 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -133,7 +136,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
index 09b4324f38b5bf6e54822cf42d469fc2b62caf0d..a3e1793de47a6336b0f3630968c6221e26d3b1c5 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
#include "OFSsurfaceFormatCore.H"
#include "clock.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
@@ -71,6 +69,4 @@ void Foam::fileFormats::OFSsurfaceFormatCore::writeHeader
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
index d9d7ef5cd39eb927b37e57db63f903eae6df84be..a13bae75262801f2d2b8e5688882450197121c7a 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatCore.H
@@ -55,16 +55,16 @@ namespace fileFormats
class OFSsurfaceFormatCore
{
protected:
- // Protected Member Functions
- //- Write header information and surfZoneList
- static void writeHeader
- (
- Ostream&,
- const pointField&,
- const UList<surfZone>&
- );
+ // Protected Member Functions
+ //- Write header information and surfZoneList
+ static void writeHeader
+ (
+ Ostream&,
+ const pointField&,
+ const UList<surfZone>&
+ );
};
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
index fc1e609d67aaa2f99075514e6b1febc4f84d637d..277851085269c9d2b6d0d0409a4e528bc9f98517 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
index c354f4ce5a84a679606c796617b4ba6fa160065e..085de6d904609aeb76539dfabbb996e563ffdfd4 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.C
@@ -30,16 +30,13 @@ License
#include "OFstream.H"
#include "Ostream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
Foam::fileFormats::SMESHsurfaceFormat<Face>::SMESHsurfaceFormat()
{}
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index c3a472da3fefe0c8d3272bb067d47b0764fc4a29..b1c54f5e60b7b76e8d4816f4fe17bf25d6265009 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -70,6 +70,7 @@ class SMESHsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const SMESHsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -77,7 +78,6 @@ public:
//- Construct null
SMESHsurfaceFormat();
- // Selectors
// Destructor
@@ -90,13 +90,11 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
-
//- Write object
virtual void write(const fileName& name) const
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
index e985af30ad20d6ce1baf1498f765f88c6f339533..77a094bd2b149afe4baa4b04412a244d076b1013 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 0daa6de71bf075b9106df57fea3a30963e48d90a..2f8f48ccd515fcca9ec1672aee77c759b3a9f87a 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -27,8 +27,6 @@ License
#include "STARCDsurfaceFormat.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@@ -73,6 +71,7 @@ Foam::fileFormats::STARCDsurfaceFormat<Face>::STARCDsurfaceFormat
read(filename);
}
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
index 9bdb435bd7482e222296c5e0ac31f8da9ffd8ca3..c799d8ebfadd491cd572f1e7435ae005c9469aee 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H
@@ -72,6 +72,7 @@ class STARCDsurfaceFormat
//- STAR-CD identifier for shell type (shells vs. baffles)
static const int starcdShellType_ = 4;
+
// Private Member Functions
static inline void writeShell
@@ -88,6 +89,7 @@ class STARCDsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const STARCDsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -95,6 +97,7 @@ public:
//- Construct from file name
STARCDsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -106,9 +109,10 @@ public:
);
}
- // Destructor
- virtual ~STARCDsurfaceFormat()
- {}
+
+ //- Destructor
+ virtual ~STARCDsurfaceFormat()
+ {}
// Member Functions
@@ -116,7 +120,6 @@ public:
//- Write surface mesh components by proxy
static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -125,7 +128,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
index ab052f5229c664409bac876c44ac78be5c97ea36..5777dcb73cfcb1fc72ad24f6e2965dcbcf24c790 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
@@ -28,8 +28,6 @@ License
#include "clock.H"
#include "IStringStream.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::fileFormats::STARCDsurfaceFormatCore::readHeader
@@ -193,7 +191,6 @@ void Foam::fileFormats::STARCDsurfaceFormatCore::writeCase
os.flush();
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
index 42d5cc077eb15d418861f3722a0b82c9bed85bea..883a3930479d4133ecbbe7c75cbb498b1b9b5ce3 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H
@@ -55,6 +55,7 @@ namespace fileFormats
class STARCDsurfaceFormatCore
{
protected:
+
// Protected Member Functions
static bool readHeader(IFstream&, const word&);
@@ -72,7 +73,6 @@ protected:
const label nFaces,
const UList<surfZone>&
);
-
};
@@ -83,8 +83,6 @@ protected:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
index 5affcb99604187dab45319d4b1a5edfbdfa0fddc..a65d690ca22e8a5c769a21852f00e97dfdeba1b7 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/stl/STLpoint.H b/src/surfMesh/surfaceFormats/stl/STLpoint.H
index a92c56fc8d36b39d43eab5fb47d7cb5f82e3b639..98a3c309f76fde1923dab84008949e28af8ed4e8 100644
--- a/src/surfMesh/surfaceFormats/stl/STLpoint.H
+++ b/src/surfMesh/surfaceFormats/stl/STLpoint.H
@@ -87,7 +87,6 @@ public:
{
return point(x(), y(), z());
}
-
};
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index 2f9d54371a584735907e988d99e1b2b174feac0a..af3f3fff81bd40f2bc99b9dd746c7ae405de6fc2 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -28,8 +28,6 @@ License
#include "ListOps.H"
#include "triPointRef.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@@ -441,6 +439,7 @@ void Foam::fileFormats::STLsurfaceFormat<Face>::writeBinary
}
}
+
template<class Face>
void Foam::fileFormats::STLsurfaceFormat<Face>::write
(
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
index ada49101aeb3398eb472a1e134a8ca51b258d579..4e2de920c4ff3cc256b7df9c13abc1f517b1f3b2 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.H
@@ -86,6 +86,8 @@ class STLsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const STLsurfaceFormat<Face>&);
+
+
public:
// Constructors
@@ -93,6 +95,7 @@ public:
//- Construct from file name
STLsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -104,9 +107,11 @@ public:
);
}
- // Destructor
- virtual ~STLsurfaceFormat()
- {}
+
+ //- Destructor
+ virtual ~STLsurfaceFormat()
+ {}
+
// Member Functions
@@ -146,7 +151,6 @@ public:
// as ASCII or BINARY, depending on the extension
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -155,7 +159,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
index f9d052d6aca30d70b3f292c216590b97493cc150..887fed0fd9caa67e0ab48929a2678beeb113e0a2 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
@@ -33,8 +33,6 @@ License
#undef DEBUG_STLBINARY
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// check binary by getting the header and number of facets
@@ -276,4 +274,5 @@ void Foam::fileFormats::STLsurfaceFormatCore::writeHeaderBINARY
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 7e4fe94e8a325667947614831481119586dd25c6..ee2308a820f2395d4cf80c60aae5d8e7f311e0dc 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -71,6 +71,7 @@ class STLsurfaceFormatCore
//- The solid count, in the order of their first appearance
List<label> sizes_;
+
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -88,6 +89,7 @@ class STLsurfaceFormatCore
//- Read BINARY
bool readBINARY(istream&, const off_t);
+
public:
// Static Data
@@ -95,20 +97,24 @@ public:
//- The number of bytes in the STL binary header
static const unsigned int headerSize = 80;
+
// Static Member Functions
//- Write "STL binary file" and number of triangles to stream
static void writeHeaderBINARY(ostream&, unsigned int);
+
// Constructors
//- Read from file, filling in the information
STLsurfaceFormatCore(const fileName&);
+
// Destructor
~STLsurfaceFormatCore();
+
// Member Functions
//- File read was already sorted
@@ -150,7 +156,6 @@ public:
{
return sizes_;
}
-
};
@@ -161,8 +166,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
index 8e78ce7675d521aeea800fc091b095486e1ac466..2358a4fe85abd8bc2e1d70295a7c5dc8695dd9ae 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangle.H b/src/surfMesh/surfaceFormats/stl/STLtriangle.H
index 924f0bb6b7ef08dc67b508d866d24737db315f74..a5fe9f5640ccea01e8979ea922cdd172d366d75e 100644
--- a/src/surfMesh/surfaceFormats/stl/STLtriangle.H
+++ b/src/surfMesh/surfaceFormats/stl/STLtriangle.H
@@ -65,6 +65,7 @@ class STLtriangle
//- The attribute information could for colour or solid id, etc
STLattrib attrib_;
+
public:
// Constructors
@@ -96,11 +97,13 @@ public:
inline const STLpoint& c() const;
inline unsigned short attrib() const;
+
// Read
//- Read from istream (binary)
inline void read(istream&);
+
// Write
//- Write to ostream (binary)
diff --git a/src/surfMesh/surfaceFormats/stl/STLtriangleI.H b/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
index 44b2bfe3249f8c9bb89292f696b6c445c4ed137b..ef63c4ea627d5ad3e57370239b46fb8f6d56b2ca 100644
--- a/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
+++ b/src/surfMesh/surfaceFormats/stl/STLtriangleI.H
@@ -24,8 +24,6 @@ License
\*---------------------------------------------------------------------------*/
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
inline Foam::STLtriangle::STLtriangle()
@@ -62,21 +60,25 @@ inline const Foam::STLpoint& Foam::STLtriangle::normal() const
return normal_;
}
+
inline const Foam::STLpoint& Foam::STLtriangle::a() const
{
return a_;
}
+
inline const Foam::STLpoint& Foam::STLtriangle::b() const
{
return b_;
}
+
inline const Foam::STLpoint& Foam::STLtriangle::c() const
{
return c_;
}
+
inline unsigned short Foam::STLtriangle::attrib() const
{
return attrib_;
@@ -96,6 +98,7 @@ inline void Foam::STLtriangle::write(ostream& os)
os.write(reinterpret_cast<char*>(&attrib_), sizeof(STLattrib));
}
+
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
@@ -110,6 +113,4 @@ inline Foam::Ostream& Foam::operator<<(Ostream& os, const STLtriangle& t)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index 3c5a8a7344da92d870d70fe1390eefa221270440..497901609fa1d21e542a769839e8d29cc89b32c1 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -38,8 +38,7 @@ Foam::word Foam::fileFormats::surfaceFormatsCore::nativeExt("ofs");
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-Foam::string
-Foam::fileFormats::surfaceFormatsCore::getLineNoComment
+Foam::string Foam::fileFormats::surfaceFormatsCore::getLineNoComment
(
IFstream& is
)
@@ -54,9 +53,12 @@ Foam::fileFormats::surfaceFormatsCore::getLineNoComment
return line;
}
+
#if 0
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::localMeshFileName
+(
+ const word& surfName
+)
{
const word name(surfName.size() ? surfName : surfaceRegistry::defaultName);
@@ -68,8 +70,7 @@ Foam::fileFormats::surfaceFormatsCore::localMeshFileName(const word& surfName)
}
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::findMeshInstance
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshInstance
(
const Time& t,
const word& surfName
@@ -109,8 +110,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshInstance
}
-Foam::fileName
-Foam::fileFormats::surfaceFormatsCore::findMeshFile
+Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshFile
(
const Time& t,
const word& surfName
@@ -154,8 +154,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshFile
#endif
-bool
-Foam::fileFormats::surfaceFormatsCore::checkSupport
+bool Foam::fileFormats::surfaceFormatsCore::checkSupport
(
const wordHashSet& available,
const word& ext,
@@ -199,18 +198,4 @@ Foam::fileFormats::surfaceFormatsCore::~surfaceFormatsCore()
{}
-// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
index b23ff267191650effebdb247a9d0377d1b6589d7..83a2203b9d522fb1097ad28f919705cd1adb2f0e 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
@@ -78,6 +78,7 @@ protected:
//- Read non-comment line
static string getLineNoComment(IFstream&);
+
public:
// Static Data
@@ -86,6 +87,7 @@ public:
// Normally "ofs" (mnemonic: OF = OpenFOAM, S = Surface)
static word nativeExt;
+
// Static Member Functions
static bool checkSupport
@@ -96,7 +98,6 @@ public:
const word& functionName
);
-
//- Return the local file name (within time directory)
// NEEDS FIXING
static fileName localMeshFileName(const word& surfName="");
@@ -109,28 +110,16 @@ public:
// NEEDS FIXING
static fileName findMeshFile(const Time&, const word& surfName="");
+
// Constructors
//- Construct null
surfaceFormatsCore();
+
// Destructor
virtual ~surfaceFormatsCore();
-
- // Member Functions
-
- // Access
-
- // Edit
-
- // Read
-
- // Write
-
- // Member operators
-
- // Ostream Operator
};
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index da5d8685140d3865c8a00ada927c49f4387b7018..f1db14b73dee324fe8f18e672752f1e1a61e9f8b 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -27,8 +27,6 @@ License
#include "TRIsurfaceFormat.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Face>
@@ -235,4 +233,5 @@ void Foam::fileFormats::TRIsurfaceFormat<Face>::write
}
}
+
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
index 557cb60170314dd75688d4862cf1639acc4d013e..1dce89f5f65e7113d9fcdd6e314368aca34eb8b4 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.H
@@ -77,6 +77,7 @@ class TRIsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const TRIsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -84,6 +85,7 @@ public:
//- Construct from file name
TRIsurfaceFormat(const fileName&);
+
// Selectors
//- Read file and return surface
@@ -95,9 +97,11 @@ public:
);
}
- // Destructor
- virtual ~TRIsurfaceFormat()
- {}
+
+ //- Destructor
+ virtual ~TRIsurfaceFormat()
+ {}
+
// Member Functions
@@ -108,7 +112,6 @@ public:
// by default the output is not sorted by zones
static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
-
//- Read from file
virtual bool read(const fileName&);
@@ -117,7 +120,6 @@ public:
{
write(name, MeshedSurfaceProxy<Face>(*this));
}
-
};
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
index 8bb4e875e2bfde07a3502dc37b2e3416488c0b1a..a6b9c999120b8119f52c06a73879cedfae4a5d08 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C
@@ -30,10 +30,6 @@ License
#include "IStringStream.H"
#include "Map.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
@@ -49,6 +45,7 @@ Foam::fileFormats::TRIsurfaceFormatCore::TRIsurfaceFormatCore
read(filename);
}
+
// * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * * //
Foam::fileFormats::TRIsurfaceFormatCore::~TRIsurfaceFormatCore()
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
index 67b459528094e02dabd773bb63bec892f6c81c05..854078d307e08cd25b5e94aaed4881030c0a3037 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
@@ -71,6 +71,7 @@ class TRIsurfaceFormatCore
//- The solid count, in the order of their first appearance
List<label> sizes_;
+
// Private Member Functions
//- Disallow default bitwise copy construct
@@ -81,6 +82,7 @@ class TRIsurfaceFormatCore
bool read(const fileName&);
+
public:
// Constructors
@@ -88,10 +90,12 @@ public:
//- Read from file, filling in the information
TRIsurfaceFormatCore(const fileName&);
+
// Destructor
~TRIsurfaceFormatCore();
+
// Member Functions
//- File read was already sorted
@@ -126,7 +130,6 @@ public:
{
return sizes_;
}
-
};
@@ -137,8 +140,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
#endif
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
index 9f333cc4fe4580db09f644c93a92f8f580cdd414..ecce786c531f64d1b81369dde4306e3becef2d9d 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index c8a1fbf1db56e1d212fa57897df65417bc71fd6a..2b09481030efa3d5af5af110df973b9beafe43ba 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -26,9 +26,8 @@ License
#include "VTKsurfaceFormat.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+
template<class Face>
void Foam::fileFormats::VTKsurfaceFormat<Face>::writeHeaderPolygons
(
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index 93e3510ca1c286219e8b8e444ced4e20f48b2941..ffd9349b431b3e1a6122a2f179ddaebaac639ee8 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -70,6 +70,7 @@ class VTKsurfaceFormat
//- Disallow default bitwise assignment
void operator=(const VTKsurfaceFormat<Face>&);
+
public:
// Constructors
@@ -77,30 +78,35 @@ public:
//- Construct null
VTKsurfaceFormat();
- // Selectors
// Destructor
virtual ~VTKsurfaceFormat()
{}
+
// Member Functions
// Write
- //- Write surface mesh components by proxy
- static void write(const fileName&, const MeshedSurfaceProxy<Face>&);
-
- //- Write UnsortedMeshedSurface, the output remains unsorted
- static void write(const fileName&, const UnsortedMeshedSurface<Face>&);
+ //- Write surface mesh components by proxy
+ static void write
+ (
+ const fileName&, const MeshedSurfaceProxy<Face>&
+ );
+ //- Write UnsortedMeshedSurface, the output remains unsorted
+ static void write
+ (
+ const fileName&, const UnsortedMeshedSurface<Face>&
+ );
- //- Write object
- virtual void write(Ostream& os) const
- {
- write(os, MeshedSurfaceProxy<Face>(*this));
- }
+ //- Write object
+ virtual void write(Ostream& os) const
+ {
+ write(os, MeshedSurfaceProxy<Face>(*this));
+ }
};
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index c4059632f1832edd994f05e9a4d94bd7e126fe35..edd6969bf7646a8605833116f49e2be6b40e274e 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
#include "VTKsurfaceFormatCore.H"
#include "clock.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::VTKsurfaceFormatCore::writeHeader
@@ -127,6 +125,4 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index d0f6ed1de587750a17c40b033ced59e5e08a3c72..f446e0b4a023352027c5d095b30cdaf28256395f 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -54,21 +54,21 @@ namespace fileFormats
class VTKsurfaceFormatCore
{
protected:
- // Protected Member Functions
- //- Write header information with points
- static void writeHeader
- (
- Ostream&,
- const pointField&
- );
+ // Protected Member Functions
- //- Write trailing information with zone information
- static void writeTail(Ostream&, const UList<surfZone>&);
+ //- Write header information with points
+ static void writeHeader
+ (
+ Ostream&,
+ const pointField&
+ );
- //- Write trailing information with zone Ids
- static void writeTail(Ostream&, const UList<label>& zoneIds);
+ //- Write trailing information with zone information
+ static void writeTail(Ostream&, const UList<surfZone>&);
+ //- Write trailing information with zone Ids
+ static void writeTail(Ostream&, const UList<label>& zoneIds);
};
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
index bd300b84f728f4d03a9b0ddca44a014800d7b66c..fc9df8c52af5d9eb179036e595cdeceb1b065a34 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
index c17280689e1d6e74d4beea8a6a4c1da8c52b0999..e141096fbc3de04225c05ed79877bf2d0419e299 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C
@@ -30,8 +30,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
@@ -140,7 +138,6 @@ void Foam::fileFormats::WRLsurfaceFormat<Face>::write
" }\n" // end Shape
" ]\n" // end children
"}\n"; // end Group
-
}
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
index d89613d7b68c2ae8c6cba2de439f0a67b6f6b501..975cd76bfbf589f96a31762e977233b3fd108185 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
@@ -74,8 +74,6 @@ public:
//- Construct null
WRLsurfaceFormat();
- // Selectors
-
// Destructor
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
index b5eb87058ad360afffc370ea765686a1c0b42e25..2b8f91bf8c1fe334cf93b28f590253d55c731655 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
#include "WRLsurfaceFormatCore.H"
#include "clock.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
@@ -36,7 +34,7 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
Ostream& os,
const pointField& pointLst,
const label nFaces,
- const UList<surfZone>& zoneLst
+ const UList<surfZone>& zoneLst
)
{
os << "#VRML V2.0 utf8" << nl
@@ -52,8 +50,6 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeHeader
os << "# " << zoneI << " " << zoneLst[zoneI].name()
<< " (nFaces: " << zoneLst[zoneI].size() << ")" << nl;
}
-
-
}
@@ -75,6 +71,4 @@ void Foam::fileFormats::WRLsurfaceFormatCore::writeAppearance
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
index f621be7a98ad2537f0f07a34af74fe1789af2e7c..dc97b93cb92c29a32b2262e6126377e676d8ae7e 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C
@@ -30,6 +30,7 @@ License
#include "addToMemberFunctionSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
namespace Foam
{
namespace fileFormats
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
index f2e5afbcb83ace4802cb9e7f8fc72a8e4a67ca61..0150168ff9d6bb388e29a2bed6e4de8bdb22fb07 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C
@@ -32,8 +32,6 @@ License
#include "OFstream.H"
#include "ListOps.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index 130bb226c8b53a1295972f20cd7b294c01a8a77a..7bde4dbb23ee5c8f4dbecfafff1a417e303bbd93 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -73,8 +73,6 @@ public:
//- Construct null
X3DsurfaceFormat();
- // Selectors
-
// Destructor
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
index 104fb8e5f72967a74782cc9c8148d52f786f307b..16f11f5810f404e1b983d7de6dcc2b4ae9c29861 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C
@@ -27,8 +27,6 @@ License
#include "X3DsurfaceFormatCore.H"
#include "clock.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::fileFormats::X3DsurfaceFormatCore::writeHeader
@@ -65,6 +63,4 @@ void Foam::fileFormats::X3DsurfaceFormatCore::writeAppearance
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.C b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
index ed0460cdf07e38d0cb1e32f256879d074dd6139c..5287d55590470413879ec4047877b85a4e2fbfea 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.C
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.C
@@ -62,7 +62,5 @@ Foam::surfaceRegistry::surfaceRegistry
Foam::surfaceRegistry::~surfaceRegistry()
{}
-// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
index 11e02255061986d1fb1aec3584422bb081bb6837..40a38de20bb1cf97681c3873dc2fdbe65416c42b 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
@@ -72,6 +72,7 @@ public:
//- The default surface name: %default
static word defaultName;
+
// Constructors
//- Construct for the given objectRegistry and named surface
@@ -81,7 +82,6 @@ public:
// Destructor
virtual ~surfaceRegistry();
-
};
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
index e409d243c8ec7e8b91848f093da7b1303c6273f4..19e345abe0b321bcfd619c1068a28417539a4b16 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
@@ -102,12 +102,13 @@ void fixedEnthalpyFvPatchScalarField::updateCoeffs()
(
"thermophysicalProperties"
);
-
+
const label patchi = patch().index();
- fvPatchScalarField& Tw =
+ fvPatchScalarField& Tw =
const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
Tw.evaluate();
+
operator==(thermo.h(Tw, patchi));
fixedValueFvPatchScalarField::updateCoeffs();
diff --git a/src/thermophysicalModels/radiation/include/createRadiationModel.H b/src/thermophysicalModels/radiation/include/createRadiationModel.H
index d61082c36fdc563e400e4f47bb6ee0050597bc2c..87dd5e52e2b9a61d161dfa5e8e05f254c3881bed 100644
--- a/src/thermophysicalModels/radiation/include/createRadiationModel.H
+++ b/src/thermophysicalModels/radiation/include/createRadiationModel.H
@@ -1,4 +1,3 @@
- Info<< "Creating radiation model\n" << endl;
autoPtr<radiation::radiationModel> radiation
(
radiation::radiationModel::New(thermo.T())
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
index 1016a33a97bb9d11a365fc09b3a96b91423da34e..984c06bdf2c876fb9e5c8aa4194140561309ba99 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
@@ -26,24 +26,6 @@ License
#include "basicMultiComponentMixture.H"
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-void Foam::basicMultiComponentMixture::correctMassFractions()
-{
- volScalarField Yt = Y_[0];
-
- for(label n=1; n<Y_.size(); n++)
- {
- Yt += Y_[n];
- }
-
- forAll (Y_, n)
- {
- Y_[n] /= Yt;
- }
-}
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicMultiComponentMixture::basicMultiComponentMixture
@@ -120,7 +102,8 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
}
}
- correctMassFractions();
+ // Do not enforce constraint of sum of mass fractions to equal 1 here
+ // - not applicable to all models
}
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index a21485889a666654d49d88f5da946a35b12892a6..4a83754c0ff910f9edfb615ab12f350198fa602e 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -63,12 +63,6 @@ protected:
PtrList<volScalarField> Y_;
- // Protected member functions
-
- //- Correct the mass fractions to sum to 1
- void correctMassFractions();
-
-
public:
// Constructors
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 521959a2e9c4907cab5d5341690a263bc800a5c3..62458df4642e080f127272773d8c12a9b639a67b 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -47,6 +47,23 @@ const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
}
+template<class ThermoType>
+void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
+{
+ volScalarField Yt = Y_[0];
+
+ for (label n=1; n<Y_.size(); n++)
+ {
+ Yt += Y_[n];
+ }
+
+ forAll (Y_, n)
+ {
+ Y_[n] /= Yt;
+ }
+}
+
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ThermoType>
@@ -70,6 +87,8 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
new ThermoType(*specieThermoData[species_[i]])
);
}
+
+ correctMassFractions();
}
@@ -83,7 +102,9 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
basicMultiComponentMixture(thermoDict, thermoDict.lookup("species"), mesh),
speciesData_(species_.size()),
mixture_("mixture", constructSpeciesData(thermoDict))
-{}
+{
+ correctMassFractions();
+}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/solids/C/C.C b/src/thermophysicalModels/solids/C/C.C
index 1dbcfd2eed25f46a5948eef699d2717d5c5a0169..e36eb718707fce2c3b851bbe6bc2eb6bdb9a9549 100644
--- a/src/thermophysicalModels/solids/C/C.C
+++ b/src/thermophysicalModels/solids/C/C.C
@@ -42,9 +42,12 @@ Foam::C::C()
:
solid(2010, 710, 0.04, 0.0, 1.0)
{
- WarningIn("C::C()")
- << "Properties of graphite need to be checked!!!"
- << endl;
+ if (debug)
+ {
+ WarningIn("C::C()")
+ << "Properties of graphite need to be checked!!!"
+ << endl;
+ }
}
diff --git a/src/thermophysicalModels/solids/CaCO3/CaCO3.C b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
index 77a4398322a48c74123ed77f490721d16ced4751..6a84f46c4ca13611f2c01a926c2fc11f510620db 100644
--- a/src/thermophysicalModels/solids/CaCO3/CaCO3.C
+++ b/src/thermophysicalModels/solids/CaCO3/CaCO3.C
@@ -42,9 +42,12 @@ Foam::CaCO3::CaCO3()
:
solid(2710, 850, 1.3, 0.0, 1.0)
{
- WarningIn("CaCO3::CaCO3()")
- << "Properties of CaCO3 need to be checked!!!"
- << endl;
+ if (debug)
+ {
+ WarningIn("CaCO3::CaCO3()")
+ << "Properties of CaCO3 need to be checked!!!"
+ << endl;
+ }
}
diff --git a/src/thermophysicalModels/solids/ash/ash.C b/src/thermophysicalModels/solids/ash/ash.C
index c904131aab258699500b7aee1175dc63bd96c71b..e666638d77a2115343b9717349e1a12d97fa19ff 100644
--- a/src/thermophysicalModels/solids/ash/ash.C
+++ b/src/thermophysicalModels/solids/ash/ash.C
@@ -42,9 +42,12 @@ Foam::ash::ash()
:
solid(2010, 710, 0.04, 0.0, 1.0)
{
- WarningIn("ash::ash()")
- << "Properties of ash need to be checked!!!"
- << endl;
+ if (debug)
+ {
+ WarningIn("ash::ash()")
+ << "Properties of ash need to be checked!!!"
+ << endl;
+ }
}
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 294a96005a397a24e43c2e87d9643083aa90bb5a..7264041083d36774276d22b4cd14214dd4d6debc 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -30,14 +30,17 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize>
-Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& is)
+Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
+(
+ Istream& is
+)
:
EquationOfState(is),
Hf_(readScalar(is)),
Sf_(readScalar(is)),
cpPolynomial_("cpPolynomial", is),
- dhPolynomial_("dhPolynomial", cpPolynomial_.integrate()),
- sPolynomial_("sPolynomial", cpPolynomial_.integrateMinus1())
+ dhPolynomial_(cpPolynomial_.integrate()),
+ sPolynomial_(cpPolynomial_.integrateMinus1())
{}
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index 32191a8bfc0a77efac9adc0136b3f04655275e4e..a0268ea59f892e3c23c09b567c8f04d1eb4e131a 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -41,19 +41,20 @@ namespace LESModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(p, iF)
+ fixedValueFvPatchScalarField(p, iF),
+ UName_("U"),
+ rhoName_("rho"),
+ muName_("mu")
{}
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
(
const muSgsWallFunctionFvPatchScalarField& ptf,
const fvPatch& p,
@@ -61,52 +62,49 @@ muSgsWallFunctionFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+ fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+ UName_(ptf.UName_),
+ rhoName_(ptf.rhoName_),
+ muName_(ptf.muName_)
{}
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
-(
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF,
- Istream& is
-)
-:
- fixedValueFvPatchScalarField(p, iF, is)
-{}
-
-
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF, dict)
+ fixedValueFvPatchScalarField(p, iF, dict),
+ UName_(dict.lookupOrDefault<word>("U", "U")),
+ rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+ muName_(dict.lookupOrDefault<word>("mu", "mu"))
{}
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
(
- const muSgsWallFunctionFvPatchScalarField& tppsf
+ const muSgsWallFunctionFvPatchScalarField& mwfpsf
)
:
- fixedValueFvPatchScalarField(tppsf)
+ fixedValueFvPatchScalarField(mwfpsf),
+ UName_(mwfpsf.UName_),
+ rhoName_(mwfpsf.rhoName_),
+ muName_(mwfpsf.muName_)
{}
-muSgsWallFunctionFvPatchScalarField::
-muSgsWallFunctionFvPatchScalarField
+muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
(
- const muSgsWallFunctionFvPatchScalarField& tppsf,
+ const muSgsWallFunctionFvPatchScalarField& mwfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(tppsf, iF)
+ fixedValueFvPatchScalarField(mwfpsf, iF),
+ UName_(mwfpsf.UName_),
+ rhoName_(mwfpsf.rhoName_),
+ muName_(mwfpsf.muName_)
{}
@@ -125,15 +123,15 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
const scalarField& ry = patch().deltaCoeffs();
const fvPatchVectorField& U =
- patch().lookupPatchField<volVectorField, vector>("U");
+ patch().lookupPatchField<volVectorField, vector>(UName_);
scalarField magUp = mag(U.patchInternalField() - U);
const scalarField& muw =
- patch().lookupPatchField<volScalarField, scalar>("mu");
+ patch().lookupPatchField<volScalarField, scalar>(muName_);
const scalarField& rhow =
- patch().lookupPatchField<volScalarField, scalar>("rho");
+ patch().lookupPatchField<volScalarField, scalar>(rhoName_);
scalarField& muSgsw = *this;
@@ -143,13 +141,10 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
{
scalar magUpara = magUp[facei];
- scalar utau = sqrt
- (
- (muSgsw[facei] + muw[facei])
- *magFaceGradU[facei]/rhow[facei]
- );
+ scalar utau =
+ sqrt((muSgsw[facei] + muw[facei])*magFaceGradU[facei]/rhow[facei]);
- if(utau > 0)
+ if (utau > 0)
{
int iter = 0;
scalar err = GREAT;
@@ -176,7 +171,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
} while (utau > VSMALL && err > 0.01 && ++iter < 10);
muSgsw[facei] =
- max(rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],0.0);
+ max
+ (
+ rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],
+ 0.0
+ );
}
else
{
@@ -186,6 +185,16 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
}
+void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+ fvPatchField<scalar>::write(os);
+ writeEntryIfDifferent<word>(os, "U", "U", UName_);
+ writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+ writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+ writeEntry("value", os);
+}
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index 916685fd7c315e212721bb130d6c76006cf1a224..0f55216d5113664fb6a564c936074f0f07b1f886 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
@@ -58,6 +58,15 @@ class muSgsWallFunctionFvPatchScalarField
{
// Private data
+ //- Name of velocity field
+ word UName_;
+
+ //- Name of density field
+ word rhoName_;
+
+ //- Name of laminar viscosity field
+ word muName_;
+
public:
@@ -74,14 +83,6 @@ public:
const DimensionedField<scalar, volMesh>&
);
- //- Construct from patch, internal field and Istream
- muSgsWallFunctionFvPatchScalarField
- (
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&,
- Istream&
- );
-
//- Construct from patch, internal field and dictionary
muSgsWallFunctionFvPatchScalarField
(
@@ -149,6 +150,11 @@ public:
(
const Pstream::commsTypes commsType=Pstream::blocking
);
+
+ // I-O
+
+ //- Write
+ void write(Ostream&) const;
};
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index 133026c0bd1027377eaf892885adca51fc7b9e2a..7673f8a887e87eda716b5c2dde7f6a43d52dc09e 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -229,10 +229,10 @@ LRR::LRR
<< exit(FatalError);
}
- mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -418,7 +418,7 @@ void LRR::correct()
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+ mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index ee2edcb55e716b5643f7cbbd788d8c7565fdaa73..08a5e0176b1e27aa2fb9da3a96719e6d04ceabc1 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -27,8 +27,6 @@ License
#include "LaunderGibsonRSTM.H"
#include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
-#include "wallDist.H"
-#include "wallDistReflection.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -251,10 +249,10 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
<< exit(FatalError);
}
- mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -349,7 +347,7 @@ void LaunderGibsonRSTM::correct()
if (!turbulence_)
{
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
@@ -457,7 +455,7 @@ void LaunderGibsonRSTM::correct()
// Re-calculate turbulent viscosity
- mut_ == Cmu_*rho_*sqr(k_)/epsilon_;
+ mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index 1db5bdb72e4342768dd27d513a04b2094f3c5bfc..b742b14d20bb955a41bc52dee8a02a3ae288c38e 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -26,7 +26,8 @@ License
#include "LaunderSharmaKE.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -141,10 +142,10 @@ LaunderSharmaKE::LaunderSharmaKE
"k",
runTime_.timeName(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- mesh_
+ autoCreateK("k", mesh_)
),
epsilon_
@@ -154,10 +155,10 @@ LaunderSharmaKE::LaunderSharmaKE
"epsilon",
runTime_.timeName(),
mesh_,
- IOobject::MUST_READ,
+ IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- mesh_
+ autoCreateEpsilon("epsilon", mesh_)
),
mut_
@@ -170,9 +171,28 @@ LaunderSharmaKE::LaunderSharmaKE
IOobject::NO_READ,
IOobject::NO_WRITE
),
- Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+ autoCreateMut("mut", mesh_)
+ ),
+
+ alphat_
+ (
+ IOobject
+ (
+ "alphat",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ autoCreateAlphat("alphat", mesh_)
)
{
+ mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_.correctBoundaryConditions();
+
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
+
printCoeffs();
}
@@ -256,6 +276,12 @@ void LaunderSharmaKE::correct()
{
// Re-calculate viscosity
mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_.correctBoundaryConditions();
+
+ // Re-calculate thermal diffusivity
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
+
return;
}
@@ -275,9 +301,11 @@ void LaunderSharmaKE::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
- volScalarField G = mut_*(tgradU() && dev(twoSymm(tgradU())));
+ volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
+ // Update espsilon and G at the wall
+ epsilon_.boundaryField().updateCoeffs();
// Dissipation equation
@@ -294,6 +322,9 @@ void LaunderSharmaKE::correct()
);
epsEqn().relax();
+
+ epsEqn().boundaryManipulate(epsilon_.boundaryField());
+
solve(epsEqn);
bound(epsilon_, epsilon0_);
@@ -317,7 +348,12 @@ void LaunderSharmaKE::correct()
// Re-calculate viscosity
- mut_ = Cmu_*fMu()*rho_*sqr(k_)/epsilon_;
+ mut_ = Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_.correctBoundaryConditions();
+
+ // Re-calculate thermal diffusivity
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 28cee3928bc922da7745469d26b1e3f295634338..b912ae539b56c2825279972946ace62a480f6aa6 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -64,7 +64,7 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
- Class LaunderSharmaKE Declaration
+ Class LaunderSharmaKE Declaration
\*---------------------------------------------------------------------------*/
class LaunderSharmaKE
@@ -73,17 +73,23 @@ class LaunderSharmaKE
{
// Private data
- dimensionedScalar Cmu_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar C3_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
- dimensionedScalar alphah_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
- volScalarField mut_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar C3_;
+ dimensionedScalar alphak_;
+ dimensionedScalar alphaEps_;
+ dimensionedScalar alphah_;
+
+
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilon_;
+ volScalarField mut_;
+ volScalarField alphat_;
// Private member functions
@@ -145,7 +151,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("alphaEff", alphah_*mut_ + alpha())
+ new volScalarField("alphaEff", alphah_*alphat_ + alpha())
);
}
diff --git a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index d019b029dbca1de95152347bf9fce96c76ba6cc2..e27c548014b7273ec56d99613005c105314e8767 100644
--- a/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,6 @@ License
#include "RNGkEpsilon.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -187,10 +186,10 @@ RNGkEpsilon::RNGkEpsilon
autoCreateAlphat("alphat", mesh_)
)
{
- mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -277,7 +276,7 @@ void RNGkEpsilon::correct()
if (!turbulence_)
{
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
@@ -349,7 +348,7 @@ void RNGkEpsilon::correct()
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+ mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 4825c6464ae450e3e558e5e092e2337950bde578..4daef2dd8e1084d7dfed62339a4d61d15151f5fb 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,8 @@ License
#include "SpalartAllmaras.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -215,8 +216,24 @@ SpalartAllmaras::SpalartAllmaras
mesh_
),
+ alphat_
+ (
+ IOobject
+ (
+ "alphat",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ autoCreateAlphat("alphat", mesh_)
+ ),
+
d_(mesh_)
{
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
+
printCoeffs();
}
@@ -305,6 +322,12 @@ void SpalartAllmaras::correct()
{
// Re-calculate viscosity
mut_ = rho_*nuTilda_*fv1(chi());
+ mut_.correctBoundaryConditions();
+
+ // Re-calculate thermal diffusivity
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
+
return;
}
@@ -338,8 +361,13 @@ void SpalartAllmaras::correct()
bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
nuTilda_.correctBoundaryConditions();
+ // Re-calculate viscosity
mut_.internalField() = fv1*nuTilda_.internalField()*rho_.internalField();
mut_.correctBoundaryConditions();
+
+ // Re-calculate thermal diffusivity
+ alphat_ = mut_/Prt_;
+ alphat_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 5a75616347ff2fbd81d9117d77ecd133dfd57f4e..7b96627f8e7d52affd944fbadb56dba041545c51 100644
--- a/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -81,7 +81,7 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
- Class SpalartAllmaras Declaration
+ Class SpalartAllmaras Declaration
\*---------------------------------------------------------------------------*/
class SpalartAllmaras
@@ -90,20 +90,27 @@ class SpalartAllmaras
{
// Private data
- dimensionedScalar alphaNut_;
- dimensionedScalar alphah_;
+ // Model coefficients
+ dimensionedScalar alphaNut_;
+ dimensionedScalar alphah_;
- dimensionedScalar Cb1_;
- dimensionedScalar Cb2_;
- dimensionedScalar Cw1_;
- dimensionedScalar Cw2_;
- dimensionedScalar Cw3_;
- dimensionedScalar Cv1_;
- dimensionedScalar Cv2_;
+ dimensionedScalar Cb1_;
+ dimensionedScalar Cb2_;
+ dimensionedScalar Cw1_;
+ dimensionedScalar Cw2_;
+ dimensionedScalar Cw3_;
+ dimensionedScalar Cv1_;
+ dimensionedScalar Cv2_;
- volScalarField nuTilda_;
- volScalarField mut_;
+ // Fields
+
+ volScalarField nuTilda_;
+ volScalarField mut_;
+ volScalarField alphat_;
+
+
+ //- Wall distance
wallDist d_;
@@ -173,7 +180,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("alphaEff", alphah_*mut_ + alpha())
+ new volScalarField("alphaEff", alphah_*alphat_ + alpha())
);
}
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index cf78541322a57a59a8ba8ae60b695f021d6c1d6e..36a3b819dedf03dc605fc46c85caf7c8bc9a8366 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -157,8 +157,6 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
patch().lookupPatchField<volScalarField, scalar>(muName_);
scalarField& mutw = *this;
- scalarField magFaceGradU = mag(U.snGrad());
-
if (roughnessHeight_ > 0.0)
{
// Rough Walls.
diff --git a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index 2b76be3c203ac6adca952b6a99f3ce2e0f8ed8fa..c7aa94cfe8a895f66c4b3bb0eb10db7a66782f66 100644
--- a/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,6 @@ License
#include "kEpsilon.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -169,10 +168,10 @@ kEpsilon::kEpsilon
autoCreateAlphat("alphat", mesh_)
)
{
- mut_ == Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -258,7 +257,7 @@ void kEpsilon::correct()
if (!turbulence_)
{
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
@@ -323,7 +322,7 @@ void kEpsilon::correct()
// Re-calculate viscosity
- mut_ == rho_*Cmu_*sqr(k_)/epsilon_;
+ mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index 7636737f4e61f17c44d6b3cab6894e6c64b40800..a75cb0d749af51e29ee8e511e65c2eef633c2e17 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,6 @@ License
#include "kOmegaSST.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -259,10 +258,10 @@ kOmegaSST::kOmegaSST
autoCreateAlphat("alphat", mesh_)
)
{
- mut_ == a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+ mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -352,7 +351,7 @@ void kOmegaSST::correct()
if (!turbulence_)
{
// Re-calculate viscosity
- mut_ ==
+ mut_ =
a1_*rho_*k_
/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
mut_.correctBoundaryConditions();
@@ -435,7 +434,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
- mut_ == a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
+ mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 23eb06705e75c3c9853dd03b56819bdb151084aa..4eaa83683b45a14b7855be227339f04100b2eb43 100644
--- a/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,6 @@ License
#include "realizableKE.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -204,10 +203,10 @@ realizableKE::realizableKE
bound(k_, k0_);
bound(epsilon_, epsilon0_);
- mut_ == rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
mut_.correctBoundaryConditions();
- alphat_ == mut_/Prt_;
+ alphat_ = mut_/Prt_;
alphat_.correctBoundaryConditions();
printCoeffs();
@@ -291,7 +290,7 @@ void realizableKE::correct()
if (!turbulence_)
{
// Re-calculate viscosity
- mut_ == rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
+ mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
@@ -362,7 +361,7 @@ void realizableKE::correct()
bound(k_, k0_);
// Re-calculate viscosity
- mut_ == rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
+ mut_ = rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
mut_.correctBoundaryConditions();
// Re-calculate thermal diffusivity
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 3ee9619340d662e792c9bb5bfa0920efe34723d5..a845089e331a15fa4f2c695c6cdb401735751b7e 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -75,7 +75,6 @@ LESModel::LESModel
)
),
- turbulence_(lookup("turbulence")),
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
coeffDict_(subDictPtr(type + "Coeffs")),
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 766cc63fc0506f329ddd8eac1327f99c2acd087d..e784535b73f54be2fcce83436731689da8152713 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -80,7 +80,6 @@ protected:
// Protected data
- Switch turbulence_;
Switch printCoeffs_;
dictionary coeffDict_;
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index 610c1bf96b27025fc3a87ea1300529efc244c6c1..b5d7b80c6e3e956bc06fef6cbff2ccafbcd8e2ee 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -48,7 +48,9 @@ nuSgsWallFunctionFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(p, iF)
+ fixedValueFvPatchScalarField(p, iF),
+ UName_("U"),
+ nuName_("nu")
{}
@@ -61,7 +63,9 @@ nuSgsWallFunctionFvPatchScalarField
const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+ fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+ UName_(ptf.UName_),
+ nuName_(ptf.nuName_)
{}
@@ -73,28 +77,34 @@ nuSgsWallFunctionFvPatchScalarField
const dictionary& dict
)
:
- fixedValueFvPatchScalarField(p, iF, dict)
+ fixedValueFvPatchScalarField(p, iF, dict),
+ UName_(dict.lookupOrDefault<word>("U", "U")),
+ nuName_(dict.lookupOrDefault<word>("nu", "nu"))
{}
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
- const nuSgsWallFunctionFvPatchScalarField& tppsf
+ const nuSgsWallFunctionFvPatchScalarField& nwfpsf
)
:
- fixedValueFvPatchScalarField(tppsf)
+ fixedValueFvPatchScalarField(nwfpsf),
+ UName_(nwfpsf.UName_),
+ nuName_(nwfpsf.nuName_)
{}
nuSgsWallFunctionFvPatchScalarField::
nuSgsWallFunctionFvPatchScalarField
(
- const nuSgsWallFunctionFvPatchScalarField& tppsf,
+ const nuSgsWallFunctionFvPatchScalarField& nwfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(tppsf, iF)
+ fixedValueFvPatchScalarField(nwfpsf, iF),
+ UName_(nwfpsf.UName_),
+ nuName_(nwfpsf.nuName_)
{}
@@ -117,12 +127,12 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
const scalarField& ry = patch().deltaCoeffs();
const fvPatchVectorField& U =
- patch().lookupPatchField<volVectorField, vector>("U");
+ patch().lookupPatchField<volVectorField, vector>(UName_);
scalarField magUp = mag(U.patchInternalField() - U);
const scalarField& nuw =
- patch().lookupPatchField<volScalarField, scalar>("nu");
+ patch().lookupPatchField<volScalarField, scalar>(nuName_);
scalarField& nuSgsw = *this;
@@ -134,7 +144,7 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
scalar utau = sqrt((nuSgsw[facei] + nuw[facei])*magFaceGradU[facei]);
- if(utau > VSMALL)
+ if (utau > VSMALL)
{
int iter = 0;
scalar err = GREAT;
@@ -171,6 +181,15 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
}
+void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+ fvPatchField<scalar>::write(os);
+ writeEntryIfDifferent<word>(os, "U", "U", UName_);
+ writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ writeEntry("value", os);
+}
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField
diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index d3f06ece81bb7f8d937a488b1dc9acbf64238b7c..9db775556ee369ae5aa423e3d9661bfad6c1688a 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -58,6 +58,12 @@ class nuSgsWallFunctionFvPatchScalarField
{
// Private data
+ //- Name of velocity field
+ word UName_;
+
+ //- Name of laminar viscosity field
+ word nuName_;
+
public:
@@ -141,6 +147,12 @@ public:
(
const Pstream::commsTypes commsType=Pstream::blocking
);
+
+
+ // I-O
+
+ //- Write
+ void write(Ostream&) const;
};
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 9418a5651902fb1b83e6627e6bba80fda3660fa4..6777535c7bf318cfdd08fa23e66c80f0d21ac981 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -186,7 +186,7 @@ LRR::LRR
autoCreateNut("nut", mesh_)
)
{
- nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
nut_.correctBoundaryConditions();
if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
@@ -380,7 +380,7 @@ void LRR::correct()
// Re-calculate viscosity
- nut_ == Cmu_*sqr(k_)/epsilon_;
+ nut_ = Cmu_*sqr(k_)/epsilon_;
nut_.correctBoundaryConditions();
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 92c72770a8625f0f38dde715d5655408b6499e5a..8eb230792f5087e2a02014537963a79f3cbc6969 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -27,6 +27,8 @@ License
#include "LamBremhorstKE.H"
#include "addToRunTimeSelectionTable.H"
+#include "backwardsCompatibilityWallFunctions.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -112,7 +114,7 @@ LamBremhorstKE::LamBremhorstKE
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
- mesh_
+ autoCreateEpsilon("epsilon", mesh_)
),
y_(mesh_),
@@ -125,8 +127,22 @@ LamBremhorstKE::LamBremhorstKE
*(scalar(1) + 20.5/(Rt_ + SMALL))
),
- nut_(Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+ nut_
+ (
+ IOobject
+ (
+ "nut",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ autoCreateNut("nut", mesh_)
+ )
{
+ nut_ = Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_.correctBoundaryConditions();
+
printCoeffs();
}
@@ -216,7 +232,7 @@ void LamBremhorstKE::correct()
y_.correct();
}
- volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_)));
+ volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Calculate parameters and coefficients for low-Reynolds number model
@@ -229,6 +245,8 @@ void LamBremhorstKE::correct()
volScalarField f1 = scalar(1) + pow(0.05/(fMu_ + SMALL), 3);
volScalarField f2 = scalar(1) - exp(-sqr(Rt_));
+ // Update espsilon and G at the wall
+ epsilon_.boundaryField().updateCoeffs();
// Dissipation equation
@@ -243,6 +261,9 @@ void LamBremhorstKE::correct()
);
epsEqn().relax();
+
+ epsEqn().boundaryManipulate(epsilon_.boundaryField());
+
solve(epsEqn);
bound(epsilon_, epsilon0_);
@@ -265,6 +286,7 @@ void LamBremhorstKE::correct()
// Re-calculate viscosity
nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
+ nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index e9b5d3a28e5764c44c015a115f387842a18b08e2..805bc3d4536c467b0935dbb49ce44619b48ea686 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -421,7 +421,7 @@ void LaunderGibsonRSTM::correct()
// Re-calculate turbulent viscosity
- nut_ == Cmu_*sqr(k_)/epsilon_;
+ nut_ = Cmu_*sqr(k_)/epsilon_;
nut_.correctBoundaryConditions();
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index d48d13845c41c0a282af9f9067704ee92b88936f..bc864c546a880ae8f2309a8e528925a2b53bfd3f 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -26,7 +26,6 @@ License
#include "LienCubicKE.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -227,7 +226,7 @@ LienCubicKE::LienCubicKE
)
)
{
- nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_;
+ nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_;
nut_.correctBoundaryConditions();
printCoeffs();
@@ -382,7 +381,7 @@ void LienCubicKE::correct()
- 2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0)
*(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()));
- nut_ == Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
+ nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
nut_.correctBoundaryConditions();
nonlinearStress_ = symm
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index bc10cdc47815598ee36c9857d19dae4f231971f2..96067ca63f39d07d3254dcf62cecebb65ff2fc16 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,6 @@ License
#include "RNGkEpsilon.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -156,7 +155,7 @@ RNGkEpsilon::RNGkEpsilon
autoCreateNut("nut", mesh_)
)
{
- nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
nut_.correctBoundaryConditions();
printCoeffs();
@@ -295,7 +294,7 @@ void RNGkEpsilon::correct()
// Re-calculate viscosity
- nut_ == Cmu_*sqr(k_)/epsilon_;
+ nut_ = Cmu_*sqr(k_)/epsilon_;
nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 4c8d457affbfbeb8cb6744b1e6409ae844434c76..35193acaf3e59ad7b609f74f30bc58c74f00f6a4 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -132,8 +132,6 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
patch().lookupPatchField<volScalarField, scalar>(nuName_);
scalarField& nutw = *this;
- scalarField magFaceGradU = mag(U.snGrad());
-
forAll(nutw, facei)
{
scalar magUpara = magUp[facei];
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index cbbc64579871f2d83cfbfe467631e39681c3ddf9..4b81fab16faf8316f76b5a568696622e0e8ce2a9 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,6 @@ License
#include "kEpsilon.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index 916a3cdb343df2ad37b3fcbb11c64ea487db7c57..64b095d27b9b6933f7e7aa25e3879bac43238ce4 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -26,7 +26,6 @@ License
#include "kOmega.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -138,7 +137,7 @@ kOmega::kOmega
autoCreateNut("nut", mesh_)
)
{
- nut_ == k_/(omega_ + omegaSmall_);
+ nut_ = k_/(omega_ + omegaSmall_);
nut_.correctBoundaryConditions();
printCoeffs();
@@ -268,7 +267,7 @@ void kOmega::correct()
// Re-calculate viscosity
- nut_ == k_/(omega_ + omegaSmall_);
+ nut_ = k_/(omega_ + omegaSmall_);
nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 850205159d4379374fec613175a1d19c521dfa8b..99721f6a12afb044c4a00d20b8068a706ba1adf8 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,6 @@ License
#include "kOmegaSST.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -237,7 +236,7 @@ kOmegaSST::kOmegaSST
autoCreateNut("nut", mesh_)
)
{
- nut_ ==
+ nut_ =
a1_*k_
/max
(
@@ -395,7 +394,7 @@ void kOmegaSST::correct()
// Re-calculate viscosity
- nut_ == a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
+ nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 576453df048765f5484818fc43ea0a13c979285a..81bef2dc61ef15dffc13739636f35e2cf2019f57 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,6 @@ License
#include "realizableKE.H"
#include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
#include "backwardsCompatibilityWallFunctions.H"
@@ -182,7 +181,7 @@ realizableKE::realizableKE
bound(k_, k0_);
bound(epsilon_, epsilon0_);
- nut_ == rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_ = rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_);
nut_.correctBoundaryConditions();
printCoeffs();
@@ -324,7 +323,7 @@ void realizableKE::correct()
// Re-calculate viscosity
- nut_ == rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
+ nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
nut_.correctBoundaryConditions();
}
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index b78ade21c1ae3a0afc4344db04c190e60b56012b..e005157d0978ecea54d006422f647e4522373801 100755
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="dnsFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
runApplication boxTurb
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
index f4b0d0b91827ed4f6e0179f873b9c930d5c65a90..8d533e8d83889c020b8c283650b6205c0d0d3115 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
+++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index 497eed73f83ef1065ecb5f01f75f107fff090ffa..d6a968af469224bda3eb2dd2578f50577cfdb76f 100755
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application directory
-application="laplacianFoam"
+# Get application name
+application=`getApplication`
runAnsysToFoam()
{
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index b4a0869ee59e91d37d4384ff14c3641950911c5a..36e2229aa640c4cb8e0eb6466cebf264ba1a5cb3 100755
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="potentialFoam"
+application=`getApplication`
runApplication blockMesh
runApplication $application
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 601903288195a35bc1aef4fc1e7c5243bc9e5d3e..cadfe86d27327f23094cd02d4eb7224cdcbd8877 100755
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="potentialFoam"
+application=`getApplication`
runApplication blockMesh
runApplication $application
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/B b/tutorials/combustion/XiFoam/les/pitzDaily/0/B
deleted file mode 100644
index 42eef7d3203689e7608ec3c5aaefe62d385cb2dc..0000000000000000000000000000000000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/B
+++ /dev/null
@@ -1,50 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volTensorField;
- object B;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform (0 0 0 0 0 0 0 0 0);
-
-boundaryField
-{
- inlet
- {
- type fixedValue;
- value uniform (0 0 0 0 0 0 0 0 0);
- }
-
- outlet
- {
- type zeroGradient;
- }
-
- upperWall
- {
- type zeroGradient;
- }
-
- lowerWall
- {
- type zeroGradient;
- }
-
- frontAndBack
- {
- type empty;
- }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
index e5dea103a4622db2a4263e7399ab07c6f82f5bc7..716a8510a45b4b7967bd81a3aaf2179694230142 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
@@ -20,30 +20,30 @@ internalField uniform 0.135;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 0.135;
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 0.135;
value uniform 0.135;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
index e112d668841e8f8ef4e45c38848ba5e2d9282099..c4bae6fa13ac3dd879f84df34c2a8c300c01f082 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/T
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
@@ -20,32 +20,32 @@ internalField uniform 293;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 293;
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 293;
value uniform 293;
}
- upperWall
+ upperWall
{
type fixedValue;
value uniform 293;
}
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform 293;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
index 9e8560d90b24b60b8e9e8dc10a7e6bd56428b7b7..3e1d003deb33078474ea1bb5149b44625ebe8afd 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
@@ -20,32 +20,32 @@ internalField uniform 293;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 293;
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 293;
value uniform 293;
}
- upperWall
+ upperWall
{
type fixedValue;
value uniform 293;
}
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform 293;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
index a69abfc235f1e665e56dbcb073516435c57cb15d..d0f924b93eefeeadb9ca3413fdd53f525d547871 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/U
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
@@ -20,33 +20,33 @@ internalField uniform (0 0 0);
boundaryField
{
- inlet
+ inlet
{
type turbulentInlet;
referenceField uniform (13.3 0 0);
fluctuationScale (0.04 0.02 0.02);
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform (0 0 0);
value uniform (0 0 0);
}
- upperWall
+ upperWall
{
type fixedValue;
value uniform (0 0 0);
}
- lowerWall
+ lowerWall
{
type fixedValue;
value uniform (0 0 0);
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
index f1a4c1388d124a9184079635a62a02dcbb4ab651..299eca908c60bf4c265fa23e3da5d250ca728fa6 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
@@ -20,30 +20,30 @@ internalField uniform 1;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 1;
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 1;
value uniform 1;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
index 9a83c0337ed2a698047bce788505fcaf4fd037eb..24c919196b5fc5ef6be77774cf17561a65bf620f 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
@@ -20,27 +20,31 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type zeroGradient;
}
- upperWall
+ upperWall
{
type zeroGradient;
+ //type compressible::alphaSgsWallFunction;
+ value uniform 0;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
+ //type compressible::alphaSgsWallFunction;
+ value uniform 0;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
index b10da29e5a43fffa2561286a3505c922f221a1df..5a487c3f1f425b66def1164071e1f0f41f5da6e3 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/b
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
@@ -20,30 +20,30 @@ internalField uniform 1;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 1;
}
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 1;
value uniform 1;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
index 4544024e3b781d0d010faf74bf526338e0e80886..43ac67fdfe715c1b2caa1490ba5b0605c980aa97 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/k
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
@@ -35,14 +35,14 @@ boundaryField
upperWall
{
- type fixedValue;
- value uniform 1e-8;
+ type zeroGradient;
+ value uniform 2e-05;
}
lowerWall
{
- type fixedValue;
- value uniform 1e-8;
+ type zeroGradient;
+ value uniform 2e-05;
}
frontAndBack
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
index 242527194d477f48e1c7362847c5762eaf01f4a4..a16e89fad9e0760021a75a44d319a335faaedecb 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
@@ -20,27 +20,31 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type zeroGradient;
}
- upperWall
+ upperWall
{
type zeroGradient;
+ //type compressible::muSgsWallFunction;
+ value uniform 0;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
+ //type compressible::muSgsWallFunction;
+ value uniform 0;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
index a3351cfeb3a8b12fc77cdb4ce1a6e509eb03be50..3700ec72b56e03dc8cbfcf5a89e774b156d57a1b 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/p
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
@@ -20,28 +20,28 @@ internalField uniform 100000;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type fixedValue;
value uniform 100000;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
index c82a1b4cc90caf39d28b1b34a2cbd30d40d1a398..86fcfc889a43013ae86413e387a662c1c269d59c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
@@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation constant;
fuel Propane;
-Su Su [ 0 1 -1 0 0 0 0 ] 0.135;
+Su Su [0 1 -1 0 0 0 0] 0.135;
-SuModel transport;
+SuModel unstrained;
-equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6;
+equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
-sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338;
+sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338;
XiModel transport;
-XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
-XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
-uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
GuldersCoeffs
{
@@ -68,17 +68,26 @@ GuldersCoeffs
}
}
-ignite no;
+ignite yes;
-ignitionSites ( );
+ignitionSites
+(
+ {
+ location (0.005 -0.02 0);
+ diameter 0.003;
+ start 0;
+ duration 0.1;
+ strength 40;
+ }
+);
ignitionSphereFraction 0;
-ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
+ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001;
-ignitionCircleFraction 0;
+ignitionCircleFraction 1;
-ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
+ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 2b77c937a2531f9bb7629ad8f4acc7dd7ff29bfb..7b4411955d2c11bc6b8d7253f832f3bfa325275c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -16,7 +16,6 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
-value ( 0 -9.81 0 );
-
+value (0 0 0);
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 23b481bcaf08ab363527c47951d6977178841f2c..f5fe65e622534e309758a62e4f54e29bc54d5113 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -17,7 +17,7 @@ FoamFile
application XiFoam;
-startFrom startTime;
+startFrom latestTime;
startTime 0;
@@ -27,9 +27,9 @@ endTime 10;
deltaT 5e-06;
-writeControl runTime;
+writeControl adjustableRunTime;
-writeInterval 0.1;
+writeInterval 0.01;
purgeWrite 0;
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
index 78f524d421c2d8e8c137d01b889d28a43cc97051..e74dbeb19147df65155e5d6c0b806c1908bc1865 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
@@ -38,7 +38,14 @@ divSchemes
div(phiXi,Xi) Gauss limitedLinear 1;
div(phiXi,Su) Gauss limitedLinear 1;
div(phiSt,b) Gauss limitedLinear01 1;
- div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; };
+ div(phi,ft_b_h_hu) Gauss multivariateSelection
+ {
+ fu limitedLinear01 1;
+ ft limitedLinear01 1;
+ b limitedLinear01 1;
+ h limitedLinear 1;
+ hu limitedLinear 1;
+ };
div(U) Gauss linear;
div((Su*grad(b))) Gauss linear;
div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -52,8 +59,8 @@ laplacianSchemes
laplacian(DkEff,k) Gauss linear corrected;
laplacian(DBEff,B) Gauss linear corrected;
laplacian((rho*(1|A(U))),p) Gauss linear corrected;
- laplacian(muEff,b) Gauss linear corrected;
- laplacian(muEff,ft) Gauss linear corrected;
+ laplacian(alphaEff,b) Gauss linear corrected;
+ laplacian(alphaEff,ft) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(alphaEff,hu) Gauss linear corrected;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
index cd3fb63f14ed693afea0db5bfbf4af4b06dc61e2..6e1d1ffd3e75b269cb9dbc9df3396105bc6a61b3 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
@@ -124,6 +124,7 @@ solvers
PISO
{
+ nOuterCorrectors 1;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
}
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
index 1568261fe21a51af1e7c78addec99a2b29deca8e..8d2c6962d76e7651b162eb8082277545aed0a8ab 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
@@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders;
fuel Propane;
-Su Su [ 0 1 -1 0 0 0 0 ] 0.135;
+Su Su [0 1 -1 0 0 0 0] 0.135;
SuModel transport;
-equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6;
+equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
-sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338;
+sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338;
XiModel transport;
-XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62;
+XiCoef XiCoef [0 0 0 0 0 0 0] 0.62;
-XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1;
+XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1;
-uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1;
+uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1;
GuldersCoeffs
{
@@ -70,15 +70,24 @@ GuldersCoeffs
ignite yes;
-ignitionSites ( { location ( 0 0 0 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 2 ; } );
+ignitionSites
+(
+ {
+ location (0 0 0);
+ diameter 0.003;
+ start 0;
+ duration 0.001;
+ strength 2;
+ }
+);
ignitionSphereFraction 1;
-ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0;
+ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
ignitionCircleFraction 0;
-ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0;
+ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index 057403310a4dba8dc69f1470dd26d8a7d6d6b978..d182180d950cf062863e09e04ae64103303645ff 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -16,7 +16,6 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
-value ( 0 0 0 );
-
+value (0 0 0);
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
index e9e872c1a8f0cdab3dd08fa2115585cf2d98fdb5..19a09dd2c70ea42bdd3a67d5f2b730301dfbb213 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,45 +10,44 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-( inlet
+5
+(
+ inlet
{
type patch;
- startFace 715675;
nFaces 600;
+ startFace 715675;
}
-
outlet
{
type patch;
- startFace 716275;
nFaces 1140;
+ startFace 716275;
}
-
upperWall
{
type wall;
- startFace 717415;
nFaces 4460;
+ startFace 717415;
}
-
lowerWall
{
type wall;
- startFace 721875;
nFaces 5000;
+ startFace 721875;
}
-
frontAndBack
{
type cyclic;
- startFace 726875;
nFaces 24450;
+ startFace 726875;
+ featureCos 0.9;
}
-
)
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index b9073e146d4cb612d560e9889ddd949e7f815776..cd473319ff939a884fed9a1032c8d947275dfed2 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -27,7 +27,7 @@ endTime 0.02;
deltaT 5e-06;
-writeControl runTime;
+writeControl adjustableRunTime;
writeInterval 0.0005;
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index a48aed068dcb8117a2bbd0d5ac465d875fb32f46..0c311946f1dfca601f372ab539d30cbf123f6316 100755
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
+# Set application name
application="XiFoam"
setControlDict () {
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
index 895e29387d1ee1b1c2553057f969136a71bb3cf0..2c67db9e2b63258a5d8603333f1eb8186ded2426 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/p b/tutorials/combustion/dieselFoam/aachenBomb/0/p
index bc33200d5ef4d08402bc2229868327363fcc75e8..b5ab5ef15ba0a2b31302049795dbff843d96ca78 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/0/p
+++ b/tutorials/combustion/dieselFoam/aachenBomb/0/p
@@ -22,19 +22,19 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 5e+06;
}
-
+
front
{
- type wedge;
+ type wedge;
}
back
{
- type wedge;
+ type wedge;
}
-
}
// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
index a686c3595536e9a183683346beee9db76b00cb37..f52dbcdfbff0ac560f24341200f77e64d2ae101c 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/epsilon
@@ -23,17 +23,17 @@ boundaryField
{
piston
{
- type epsilonWallFunction;
+ type compressible::epsilonWallFunction;
value uniform 450;
}
liner
{
- type epsilonWallFunction;
+ type compressible::epsilonWallFunction;
value uniform 450;
}
cylinderHead
{
- type epsilonWallFunction;
+ type compressible::epsilonWallFunction;
value uniform 450;
}
}
diff --git a/tutorials/combustion/engineFoam/kivaTest/-180/k b/tutorials/combustion/engineFoam/kivaTest/-180/k
index e643a368e6a2ab87ab90595b0da6a91689c365c6..b97d4da7fd174f32e08295627f20475d8e1db435 100644
--- a/tutorials/combustion/engineFoam/kivaTest/-180/k
+++ b/tutorials/combustion/engineFoam/kivaTest/-180/k
@@ -23,17 +23,17 @@ boundaryField
{
piston
{
- type kQRWallFunction;
+ type compressible::kQRWallFunction;
value uniform 4;
}
liner
{
- type kQRWallFunction;
+ type compressible::kQRWallFunction;
value uniform 4;
}
cylinderHead
{
- type kQRWallFunction;
+ type compressible::kQRWallFunction;
value uniform 4;
}
}
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index 0912af15e2ffe12b0381f599b96f577b7fa864ed..e8de444229f0ea65b9e4a2e033f78890b395602f 100755
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="engineFoam"
+# Get application name
+application=`getApplication`
runKivaToFoam ()
{
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
index dbd8b7758fa6264d533d75ffd5a1758a8484ba72..d20d46fdd9b1cca90fae300cf18cf3192ce5ae79 100755
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="rhoCentralFoam"
cases=" \
shockTube \
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
index 42aaf838ff686623150a4a9091bedcdbf5091104..fde0c49a89828d9fd64715e588847892ea53095e 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
index 5b9e11a58a23025636ff1feb0afe79e339bb66db..6da3027bfa9e0ba37aad91841bad39184d864c87 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp
@@ -890,7 +890,7 @@
(0.092027148309198 0.043035802795154 -7.5111607367588e-05)
(0.09263207221129 0.043855929103565 -7.65429970772772e-05)
(0.093192171617555 0.044640776830937 -7.79128140787704e-05)
-(0.093752202168401 0.045432032540685 -7.92938151136726e-05)
+(0.093752202168401 0.045432032540685 -7.92938151136725e-05)
(0.094312245417969 0.046226095413819 -8.067971557046e-05)
(0.09487228896823 0.047021673078023 -8.20682598350704e-05)
(0.095432330811069 0.047818192791575 -8.34584482851299e-05)
@@ -33658,7 +33658,7 @@
(0.092027148309198 0.043035802795154 7.5111607367588e-05)
(0.09263207221129 0.043855929103565 7.65429970772772e-05)
(0.093192171617555 0.044640776830937 7.79128140787704e-05)
-(0.093752202168401 0.045432032540685 7.92938151136726e-05)
+(0.093752202168401 0.045432032540685 7.92938151136725e-05)
(0.094312245417969 0.046226095413819 8.067971557046e-05)
(0.09487228896823 0.047021673078023 8.20682598350704e-05)
(0.095432330811069 0.047818192791575 8.34584482851299e-05)
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
index 492c762fdb2102f4331701a24c396f0dd7527f32..3309b5780a245733651c25baaf4c13015909bd56 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
index e04508a4d9ec5e7226811a07d39be3a0dd3bc10e..d3011e4e00b0ddce2e4de4049e318cfd6d5c89df 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
index 606cf5f91c39b642ca3486d17a7c8f948c3169e8..b77edc65ce4f6ce214c5b73b74ba1259ceb310db 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
index 4dcb5b5d7fe924949e97ae657ad420d0b2ed89f1..454f45921164c7c49c6c9e97bd59a0c4ead88908 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
index 540223e58fa9530a5203cb9ec14b94998dae2c4d..0abd1608aba0dcb6aa66c9488133a3c4b51c7588 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-front
-{
- type wall;
- nFaces 700;
- startFace 63400;
-}
-
-back
-{
- type wall;
- nFaces 700;
- startFace 64100;
-}
-
-wall
-{
- type wall;
- nFaces 1400;
- startFace 64800;
-}
-
-porosityWall
-{
- type wall;
- nFaces 1600;
- startFace 66200;
-}
-
-inlet
-{
- type patch;
- nFaces 400;
- startFace 67800;
-}
-
-outlet
-{
- type patch;
- nFaces 400;
- startFace 68200;
-}
+ front
+ {
+ type wall;
+ nFaces 700;
+ startFace 63400;
+ }
+ back
+ {
+ type wall;
+ nFaces 700;
+ startFace 64100;
+ }
+ wall
+ {
+ type wall;
+ nFaces 1400;
+ startFace 64800;
+ }
+ porosityWall
+ {
+ type wall;
+ nFaces 1600;
+ startFace 66200;
+ }
+ inlet
+ {
+ type patch;
+ nFaces 400;
+ startFace 67800;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 400;
+ startFace 68200;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
similarity index 69%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old
rename to tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
index 4ec7f08960c175a6d955e2c1d3cfb98453524647..5ce0dfcc52228b9e21d887207d38d3fc41b2d1d3 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/alphaSgs
@@ -11,30 +11,39 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object k;
+ object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [1 -1 -1 0 0 0 0];
-internalField uniform 0.1;
+internalField uniform 0;
boundaryField
{
- floor
+ inlet
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type zeroGradient;
}
- ceiling
+
+ outlet
+ {
+ type zeroGradient;
+ }
+
+ upperWall
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type zeroGradient;
}
- fixedWalls
+
+ lowerWall
+ {
+ type zeroGradient;
+ }
+
+ frontAndBack
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type empty;
}
}
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
index 242527194d477f48e1c7362847c5762eaf01f4a4..334ab2c339bd768b26d4b392768b8f29426d5446 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/0/muSgs
@@ -20,27 +20,27 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type zeroGradient;
}
- upperWall
+ upperWall
{
type zeroGradient;
}
- lowerWall
+ lowerWall
{
type zeroGradient;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 9a319af977dd86b1c9b4eee2523439c085d7c4cc..313dcceba1abd7b93d57320c4c674f1734692506 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 4bcaa9191c53d4ffe80ed303771cda5124184d9f..685eac20a35cdf645a26bf01bac287d439f64b4a 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -45,6 +45,11 @@ timePrecision 6;
runTimeModifiable yes;
+adjustTimeStep no;
+
+maxCo 0.5;
+
+
functions
{
fieldAverage1
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..a664893343e7216491ca9913ee0171ee31980aba
--- /dev/null
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -0,0 +1,58 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format binary;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+6
+(
+ front
+ {
+ type wall;
+ nFaces 700;
+ startFace 63400;
+ }
+ back
+ {
+ type wall;
+ nFaces 700;
+ startFace 64100;
+ }
+ wall
+ {
+ type wall;
+ nFaces 1400;
+ startFace 64800;
+ }
+ porosityWall
+ {
+ type wall;
+ nFaces 1600;
+ startFace 66200;
+ }
+ inlet
+ {
+ type patch;
+ nFaces 400;
+ startFace 67800;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 400;
+ startFace 68200;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
index 9b476298607bf1f435ae52d68a8eac48b679e28b..2abc731c97d64df322dd7036bb0c71065ff7ee86 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-inlet
-{
- type patch;
- nFaces 50;
- startFace 10325;
-}
-
-outlet
-{
- type patch;
- nFaces 40;
- startFace 10375;
-}
-
-bottom
-{
- type symmetryPlane;
- nFaces 25;
- startFace 10415;
-}
-
-top
-{
- type symmetryPlane;
- nFaces 125;
- startFace 10440;
-}
-
-obstacle
-{
- type patch;
- nFaces 110;
- startFace 10565;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 10500;
- startFace 10675;
-}
+ inlet
+ {
+ type patch;
+ nFaces 50;
+ startFace 10325;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 40;
+ startFace 10375;
+ }
+ bottom
+ {
+ type symmetryPlane;
+ nFaces 25;
+ startFace 10415;
+ }
+ top
+ {
+ type symmetryPlane;
+ nFaces 125;
+ startFace 10440;
+ }
+ obstacle
+ {
+ type patch;
+ nFaces 110;
+ startFace 10565;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 10500;
+ startFace 10675;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/T b/tutorials/compressible/rhoSonicFoam/shockTube/0/T
index 6ad695f316a1bf4992f460efe76f91ec8400dd59..6caa8d38ecaaacea2f00f9a8640ccc9d2c9f6c62 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/T
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/T
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,1030 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
-internalField uniform 1;
+internalField nonuniform List<scalar>
+1000
+(
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+348.432
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+278.746
+)
+;
boundaryField
{
- sides
+ sides
{
type zeroGradient;
}
-
- empty
+ empty
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/U b/tutorials/compressible/rhoSonicFoam/shockTube/0/U
index abe534b5fe0b184ff12951dc37f4f348ec01e0d0..f0e3a05af488ad92bf29260f61ceeff6d1d001b0 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/U
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/U
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
+ location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +21,15 @@ internalField uniform (0 0 0);
boundaryField
{
- sides
+ sides
{
type zeroGradient;
}
-
- empty
+ empty
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/p b/tutorials/compressible/rhoSonicFoam/shockTube/0/p
index 85c9743d3047ac85c5f8a70a45f118551cae72fe..2e4f54ab6d92d260d7b1418558067efdace707d1 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/0/p
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/p
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,1030 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
-internalField uniform 0;
+internalField nonuniform List<scalar>
+1000
+(
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+10000
+)
+;
boundaryField
{
- sides
+ sides
{
type zeroGradient;
}
-
- empty
+ empty
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
index 6ce183dba87274008dc2920bfaaeb0721c53aff2..4f0a80edd84fab2c5980f3cd4000ff185d31acb0 100755
--- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
@@ -1,9 +1,10 @@
#!/bin/sh
+
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="rhoSonicFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
runApplication setFields
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
index 0f1a86e2ce206df45a3bf45eacd5a5c8864aa52f..e4b48d35f4f621504a7e32d598b928415b8823d7 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,25 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
-sides
-{
- type patch;
- nFaces 2;
- startFace 999;
-}
-
-empty
-{
- type empty;
- nFaces 4000;
- startFace 1001;
-}
+ sides
+ {
+ type patch;
+ nFaces 2;
+ startFace 999;
+ }
+ empty
+ {
+ type empty;
+ nFaces 4000;
+ startFace 1001;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
index 6415109243edeb9e7cfcd4c2bd86eada31beb496..eede9049d770e4829fb2d746ebb736aab8cb5fb1 100755
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="rhopSonicFoam"
+application=`getApplication`
runApplication blockMesh
runApplication setFields
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
index 2e49b61dde340f83a8125427429ebc767fbda440..a38765097f42199308ac35221e7114385d1eef6f 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,25 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
-sides
-{
- type patch;
- nFaces 2;
- startFace 99;
-}
-
-empty
-{
- type empty;
- nFaces 400;
- startFace 101;
-}
+ sides
+ {
+ type patch;
+ nFaces 2;
+ startFace 99;
+ }
+ empty
+ {
+ type empty;
+ nFaces 400;
+ startFace 101;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
index a3ca808b34393ef4f90773ac641efbb7e1f50217..454f45921164c7c49c6c9e97bd59a0c4ead88908 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-inlet
-{
- type patch;
- nFaces 40;
- startFace 9440;
-}
-
-outlet
-{
- type patch;
- nFaces 40;
- startFace 9480;
-}
-
-bottom
-{
- type symmetryPlane;
- nFaces 40;
- startFace 9520;
-}
-
-top
-{
- type symmetryPlane;
- nFaces 120;
- startFace 9560;
-}
-
-obstacle
-{
- type patch;
- nFaces 80;
- startFace 9680;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 9600;
- startFace 9760;
-}
+ inlet
+ {
+ type patch;
+ nFaces 40;
+ startFace 9440;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 40;
+ startFace 9480;
+ }
+ bottom
+ {
+ type symmetryPlane;
+ nFaces 40;
+ startFace 9520;
+ }
+ top
+ {
+ type symmetryPlane;
+ nFaces 120;
+ startFace 9560;
+ }
+ obstacle
+ {
+ type patch;
+ nFaces 80;
+ startFace 9680;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 9600;
+ startFace 9760;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/Allrun b/tutorials/compressible/sonicFoam/Allrun
deleted file mode 100755
index 4f1a1e464a13287c4b685a7fdc8fc94ae46230b9..0000000000000000000000000000000000000000
--- a/tutorials/compressible/sonicFoam/Allrun
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-(cd laminar && ./Allrun)
-(cd ras && ./Allrun)
diff --git a/tutorials/compressible/sonicFoam/laminar/Allrun b/tutorials/compressible/sonicFoam/laminar/Allrun
deleted file mode 100755
index 573ff3a12dff2b3e37cb14a13f0d7ed7454b3abf..0000000000000000000000000000000000000000
--- a/tutorials/compressible/sonicFoam/laminar/Allrun
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=sonicFoam
-
-cases=" \
-forwardStep \
-shockTube \
-"
-for case in $cases
-do
- (cd $case && runApplication blockMesh)
-#
- if [ "$case" = "shockTube" ] ; then
- (cd $case && ./Allrun)
- else
- (cd $case && runApplication $application)
- fi
-#
-done
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
index 9b476298607bf1f435ae52d68a8eac48b679e28b..2abc731c97d64df322dd7036bb0c71065ff7ee86 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-inlet
-{
- type patch;
- nFaces 50;
- startFace 10325;
-}
-
-outlet
-{
- type patch;
- nFaces 40;
- startFace 10375;
-}
-
-bottom
-{
- type symmetryPlane;
- nFaces 25;
- startFace 10415;
-}
-
-top
-{
- type symmetryPlane;
- nFaces 125;
- startFace 10440;
-}
-
-obstacle
-{
- type patch;
- nFaces 110;
- startFace 10565;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 10500;
- startFace 10675;
-}
+ inlet
+ {
+ type patch;
+ nFaces 50;
+ startFace 10325;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 40;
+ startFace 10375;
+ }
+ bottom
+ {
+ type symmetryPlane;
+ nFaces 25;
+ startFace 10415;
+ }
+ top
+ {
+ type symmetryPlane;
+ nFaces 125;
+ startFace 10440;
+ }
+ obstacle
+ {
+ type patch;
+ nFaces 110;
+ startFace 10565;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 10500;
+ startFace 10675;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 6dc6509c85896b2e97e140677c9db63f6565ce21..bb2d19c9ea6baadf8970df85062797ed5ae43121 100755
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="sonicFoam"
+application=`getApplication`
runApplication blockMesh
runApplication setFields
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
index 0f1a86e2ce206df45a3bf45eacd5a5c8864aa52f..e4b48d35f4f621504a7e32d598b928415b8823d7 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,25 +10,25 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
-sides
-{
- type patch;
- nFaces 2;
- startFace 999;
-}
-
-empty
-{
- type empty;
- nFaces 4000;
- startFace 1001;
-}
+ sides
+ {
+ type patch;
+ nFaces 2;
+ startFace 999;
+ }
+ empty
+ {
+ type empty;
+ nFaces 4000;
+ startFace 1001;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/Allrun b/tutorials/compressible/sonicFoam/ras/Allrun
deleted file mode 100755
index 810c6525ebd3dbad0a9f01b21f7edff079bae876..0000000000000000000000000000000000000000
--- a/tutorials/compressible/sonicFoam/ras/Allrun
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=${PWD##*/}
-
-runStarToFoam ()
-{
- if [ -f log.starToFoam ] ; then
- echo "starToFoam already run on $PWD: remove log file to run"
- else
- echo "starToFoam: converting mesh $1"
- starToFoam $1 > log.starToFoam 2>&1
- fi
-}
-
-# Do prism
-(cd prism && foamRunTutorials)
-
-# Special handling for nacaAirfoil
-cd nacaAirfoil
- runStarToFoam prostar/nacaAirfoil
- mv constant/polyMesh/boundary temp
- sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
- temp > constant/polyMesh/boundary
- rm temp
- runApplication $application
-cd ..
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..29cc29abd53a0b7cd6506cbaa037e9dc112923fc
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runStarToFoam ()
+{
+ if [ -f log.starToFoam ] ; then
+ echo "starToFoam already run on $PWD: remove log file to run"
+ else
+ echo "starToFoam: converting mesh $1"
+ starToFoam $1 > log.starToFoam 2>&1
+ fi
+}
+
+runStarToFoam prostar/nacaAirfoil
+mv constant/polyMesh/boundary temp
+sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
+ temp > constant/polyMesh/boundary
+rm temp
+runApplication $application
diff --git a/tutorials/compressible/sonicFoam/ras/Running_Notes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
similarity index 65%
rename from tutorials/compressible/sonicFoam/ras/Running_Notes
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
index b6660052800bb1f1521e8fcc4c8333ed4b5df41b..5bfc37a8623eea846dd94fa7412721b385f8f72e 100644
--- a/tutorials/compressible/sonicFoam/ras/Running_Notes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
@@ -2,11 +2,7 @@ nacaAirfoil
~~~~~~~~~~~
* large domain with airfoil section near centre
* extremely non-orthogonal, highly skew mesh refined around the airfoil
-* running at Mach 1.78
+* running at Mach 1.78
* limited 0.5 on all laplacianSchemes because the mesh is so poor
-* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running
-* deltaT can be increased later in the run to 2e-07
-
-prism
-~~~~~
-* run to t = 0.0014 for convergence
+* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running
+* deltaT can be increased later in the run to 2e-07
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
index cee40325b6c7956e6e6307b20e32c40e562d634d..59a99aa3f008e969e793042560e7658577622325 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,39 +10,37 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
-INLE1
-{
- type patch;
- nFaces 400;
- startFace 79570;
-}
-
-OUTL2
-{
- type patch;
- nFaces 200;
- startFace 79970;
-}
-
-SYMP3
-{
- type empty;
- nFaces 80000;
- startFace 80170;
-}
-
-WALL10
-{
- type wall;
- nFaces 260;
- startFace 160170;
-}
+ INLE1
+ {
+ type patch;
+ nFaces 400;
+ startFace 79570;
+ }
+ OUTL2
+ {
+ type patch;
+ nFaces 200;
+ startFace 79970;
+ }
+ SYMP3
+ {
+ type empty;
+ nFaces 80000;
+ startFace 80170;
+ }
+ WALL10
+ {
+ type wall;
+ nFaces 260;
+ startFace 160170;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index 2929b3f01f3f6184d95ef4d4103d2507ab1fbd85..c10b44bf2d94d5e6a6568225e27a204b6bf18aa3 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -23,13 +23,13 @@ startTime 0;
stopAt endTime;
-endTime 0.03;
+endTime 0.01;
deltaT 4e-08;
writeControl runTime;
-writeInterval 1e-05;
+writeInterval 2e-04;
purgeWrite 0;
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..4eeae65666c3365d56baa2aac88a7b17fbdbf804
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ bottomWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ topWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ prismWall
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
index 18c90717aadd709468b2c24850eedcd56838cb95..a7bd5b6bb0bc4abbaef7a976081f49762a3ab986 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,42 +21,39 @@ internalField uniform 266000;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 266000;
}
-
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 266000;
value uniform 266000;
}
-
- bottomWall
+ bottomWall
{
type inletOutlet;
inletValue uniform 266000;
value uniform 266000;
}
-
- topWall
+ topWall
{
type inletOutlet;
inletValue uniform 266000;
value uniform 266000;
}
-
- prismWall
+ prismWall
{
- type zeroGradient;
+ type compressible::epsilonWallFunction;
+ value uniform 266000;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k
index dc82052c525c566eec35cbff1f7b8136d9852ffc..77ca6b529a59dfca7a4e8fe3b54408af7224eca2 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/k
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/k
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
+ location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,42 +21,39 @@ internalField uniform 1000;
boundaryField
{
- inlet
+ inlet
{
type fixedValue;
value uniform 1000;
}
-
- outlet
+ outlet
{
type inletOutlet;
inletValue uniform 1000;
value uniform 1000;
}
-
- bottomWall
+ bottomWall
{
type inletOutlet;
inletValue uniform 1000;
value uniform 1000;
}
-
- topWall
+ topWall
{
type inletOutlet;
inletValue uniform 1000;
value uniform 1000;
}
-
- prismWall
+ prismWall
{
- type zeroGradient;
+ type compressible::kQRWallFunction;
+ value uniform 1000;
}
-
- defaultFaces
+ defaultFaces
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..e7ebcbc9938012f6457fe1eab9293165fc654826
--- /dev/null
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/mut
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ bottomWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ topWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ prismWall
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
index c8440081ea56f4a71840aa66cbf9db187fcc749f..635f185a35776b3a5631fe2c030ec6a810b4eb5e 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index db8cdfa08aa3785e92d4fdc271670055628eefb0..6d1d356b34507add807d1803fa0fd05ffda30394 100755
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application=${PWD##*/}
+# Set application name
+application="sonicLiquidFoam"
setDecompressionTankFine ()
{
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
index d2479db21206720134e7eba9b6a47b97d079e993..add55d69d69695034b15d2ce266bbfdc08e97fcd 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1 b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties
similarity index 60%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1
rename to tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties
index 8e28c332b7e7f109d001bb341f718c6495a7d660..461aa9823366959bb775aa2a612410f825c7b662 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/alpha1
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties
@@ -1,37 +1,24 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
- class volScalarField;
- object alpha1;
+ class dictionary;
+ location "0/uniform/lagrangian/dsmc";
+ object particleProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
+processor0
{
- front
- {
- type empty;
- }
- back
- {
- type empty;
- }
- walls
- {
- type zeroGradient;
- }
+ particleCount 63978;
}
+
// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties
new file mode 100644
index 0000000000000000000000000000000000000000..461aa9823366959bb775aa2a612410f825c7b662
--- /dev/null
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "0/uniform/lagrangian/dsmc";
+ object particleProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+processor0
+{
+ particleCount 63978;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
index 5622060c8ee23c89d8743d2217de1c3b7381e6b0..1cc972be26a9fa8c309f14c3c0d52659e62d236c 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean
@@ -5,5 +5,3 @@
cleanCase
rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
-rm -rf processor*
-rm -f system/machines
\ No newline at end of file
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
index 402135df749b6f380b1c870897e27c053918afb4..b36908112841487e6dd4b3e2f62b06cfb8d0167f 100755
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun
@@ -4,8 +4,7 @@
runApplication blockMesh
runApplication decomposePar
-runParallel dsmcInitialise 4 system/machines
-hostname > system/machines
-runParallel dsmcFoam 4 system/machines
+runParallel dsmcInitialise 4
+runParallel dsmcFoam 4
runApplication reconstructPar -noLagrangian
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
index a81bd945995ae2476d7d49837ef74e909c5053c9..1cc972be26a9fa8c309f14c3c0d52659e62d236c 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean
@@ -5,6 +5,3 @@
cleanCase
rm -rf 0/lagrangian 0/dsmcSigmaTcRMax
-rm -rf processor*
-rm -rf forces1
-rm -f system/machines
\ No newline at end of file
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
index 402135df749b6f380b1c870897e27c053918afb4..b36908112841487e6dd4b3e2f62b06cfb8d0167f 100755
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun
@@ -4,8 +4,7 @@
runApplication blockMesh
runApplication decomposePar
-runParallel dsmcInitialise 4 system/machines
-hostname > system/machines
-runParallel dsmcFoam 4 system/machines
+runParallel dsmcInitialise 4
+runParallel dsmcFoam 4
runApplication reconstructPar -noLagrangian
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
deleted file mode 100755
index 7ff7776cb12c793a7bed32339e31b6ded3897549..0000000000000000000000000000000000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cd nanoNozzle
- rm -rf constant/polyMesh/sets
- rm -rf processor[0-9]
- cleanCase
-cd ..
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
deleted file mode 100755
index c756b2ca7e7a3d0ac97842edb011c9f6891abc98..0000000000000000000000000000000000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="mdFoam"
-
-cd nanoNozzle
- runApplication blockMesh
-
- runApplication decomposePar
- hostname > system/machines
-
- runParallel mdInitialise 4 system/machines
- runParallel $application 4 system/machines
-
- runApplication reconstructPar
-cd ..
-
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..8b3a55f4087fa2579b1626237c574e7bf492877f
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf constant/polyMesh/sets
+rm -rf processor[0-9]
+cleanCase
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..0e158046d9b3c2bd66712da3e68f9eb29df1282a
--- /dev/null
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel mdInitialise 4
+runParallel $application 4
+
+runApplication reconstructPar
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary
index 0ccf019b6d0648835d8fc60848d8e9b30ca915c0..19dcc8f12a8b46ce9ffb68f2df502fde5c416b31 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/electromagnetics/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun
index aca66b35332378f5c60c899af6ddd07101b6f780..f664a096985eb90c21bed0bb69b4b6327b0a226b 100755
--- a/tutorials/electromagnetics/mhdFoam/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
+# Set application name
application="mhdFoam"
(cd hartmann && runApplication blockMesh)
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/ft b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
similarity index 64%
rename from tutorials/combustion/XiFoam/les/pitzDaily/0/ft
rename to tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
index 886886dd1a04d437afa619b9ceae58c559def637..710f0df1b2f7dc5971250a144ed145fb1d077ad3 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/ft
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,43 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
- object ft;
+ location "0";
+ object Ux;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
+dimensions [0 1 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
- type fixedValue;
- value uniform 0;
+ type calculated;
+ value uniform 1;
}
-
- outlet
+ outlet
{
- type inletOutlet;
- inletValue uniform 0;
+ type calculated;
value uniform 0;
}
-
- upperWall
+ lowerWall
{
- type zeroGradient;
+ type calculated;
+ value uniform 0;
}
-
- lowerWall
+ upperWall
{
- type zeroGradient;
+ type calculated;
+ value uniform 0;
}
-
- frontAndBack
+ frontAndBack
{
type empty;
}
}
+
// ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy
new file mode 100644
index 0000000000000000000000000000000000000000..7154a1fe5f1e2524f18288386217986a0bdfa3fe
--- /dev/null
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object Uy;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ lowerWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ upperWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz
new file mode 100644
index 0000000000000000000000000000000000000000..fb4475364a10eae820363e0d6a1325a8a60fca97
--- /dev/null
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object Uz;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ inlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ outlet
+ {
+ type calculated;
+ value uniform 0;
+ }
+ lowerWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ upperWall
+ {
+ type calculated;
+ value uniform 0;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
index 6b2eb1756208b4f3348f13fd03b66f67d4835636..77a03408cd6effb1188ef04e37c5c8d3a13e49bb 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-8cbffd16687e |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
index edc3f6e6e24e43ced84b7af819c7871df609d574..b2d00fdb820fba3ffb9e9e58cbfc13951557cbc4 100644
--- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
+++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
index 92490b5b5ea392da192d42ec102f629c87c73e60..c3373651df31b91b556f2173779e63f6448eac26 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="buoyantBoussinesqPisoFoam"
+application=`getApplication`
compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 628624c70292d70d593effaa1a4e9fc9e2281550..c3373651df31b91b556f2173779e63f6448eac26 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="buoyantBoussinesqSimpleFoam"
+application=`getApplication`
compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
index 79dc3f4b95e1f1dff9646fd6dd1ba9fa3bbae4ac..79d959124fc56658dbdff086e4ccb22bdc0304e8 100755
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun
@@ -4,6 +4,5 @@
runApplication blockMesh
runApplication snappyHexMesh -overwrite
-runApplication setFields
runApplication buoyantBoussinesqSimpleFoam
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..e0608ea9d7b00eb29a16f26a0976246582e1df1a
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+9
+(
+ maxY
+ {
+ type empty;
+ nFaces 0;
+ startFace 60456;
+ }
+ minX
+ {
+ type empty;
+ nFaces 0;
+ startFace 60456;
+ }
+ maxX
+ {
+ type empty;
+ nFaces 0;
+ startFace 60456;
+ }
+ minY
+ {
+ type empty;
+ nFaces 0;
+ startFace 60456;
+ }
+ ground
+ {
+ type wall;
+ nFaces 590;
+ startFace 60456;
+ }
+ maxZ
+ {
+ type empty;
+ nFaces 0;
+ startFace 61046;
+ }
+ igloo_region0
+ {
+ type wall;
+ nFaces 2260;
+ startFace 61046;
+ }
+ twoFridgeFreezers_seal_0
+ {
+ type wall;
+ nFaces 1344;
+ startFace 63306;
+ }
+ twoFridgeFreezers_herring_1
+ {
+ type wall;
+ nFaces 1116;
+ startFace 64650;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index d31010ace7ef8ced9166f5e0bd4e2ec0ad4c347c..019b09810f23a644aff8b9f6446bddf2dfe24d5c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -10,9 +10,8 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object autoHexMeshDict;
+ object snappyHexMeshDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Which of the steps to run
@@ -317,7 +316,6 @@ addLayersControls
// Create buffer region for new layer terminations
nBufferCellsNoExtrude 0;
-
// Overall max number of layer addition iterations
nLayerIter 50;
}
@@ -391,4 +389,5 @@ debug 0;
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1E-6;
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
index 165068eca772f8a03129d90176be7d1ec909031b..e9bbb2d0c0082a1a5588d09aa0410915c31c62de 100755
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="buoyantPisoFoam"
+# Get application name
+application=`getApplication`
compileApplication setHotRoom
runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
index 6a98e5715d655d25f6569da8915ed83d6d3cbbb1..c3373651df31b91b556f2173779e63f6448eac26 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="buoyantSimpleFoam"
+application=`getApplication`
compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
runApplication blockMesh
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
similarity index 65%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
index 23851291dc60d3b0df3be887acfbeb0bb5067ef8..a270cb217804b2d27a86edb5a48c4f06eae11bcc 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat
@@ -11,30 +11,35 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object epsilon;
+ object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [1 -1 -1 0 0 0 0];
-internalField uniform 0.01;
+internalField uniform 0;
boundaryField
{
+ box
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
floor
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type compressible::alphatWallFunction;
+ value uniform 0;
}
ceiling
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type compressible::alphatWallFunction;
+ value uniform 0;
}
fixedWalls
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type compressible::alphatWallFunction;
+ value uniform 0;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
index d5e7b9cd0273d6d3e2024e42e6ec4aaac6be4986..312afc24a63d2b1df722665ee5a8058bd5ba10e6 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon
@@ -15,34 +15,31 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [ 0 2 -3 0 0 0 0 ];
+dimensions [0 2 -3 0 0 0 0];
internalField uniform 0.01;
boundaryField
{
- floor
+ box
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value uniform 0.01;
}
-
- ceiling
+ floor
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value uniform 0.01;
}
-
- fixedWalls
+ ceiling
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value uniform 0.01;
}
-
- box
+ fixedWalls
{
type compressible::epsilonWallFunction;
- value uniform 0;
+ value uniform 0.01;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
index 5b206f8e4e379cbc9d5a2764071140549649d354..daee97520994b149a137abd69b67b21858d2303a 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k
@@ -15,34 +15,31 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [ 0 2 -2 0 0 0 0 ];
+dimensions [0 2 -2 0 0 0 0];
internalField uniform 0.1;
boundaryField
{
- floor
+ box
{
type compressible::kQRWallFunction;
- value uniform 0;
+ value uniform 0.1;
}
-
- ceiling
+ floor
{
type compressible::kQRWallFunction;
- value uniform 0;
+ value uniform 0.1;
}
-
- fixedWalls
+ ceiling
{
type compressible::kQRWallFunction;
- value uniform 0;
+ value uniform 0.1;
}
-
- box
+ fixedWalls
{
type compressible::kQRWallFunction;
- value uniform 0;
+ value uniform 0.1;
}
}
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
similarity index 69%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old
rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
index 4ec7f08960c175a6d955e2c1d3cfb98453524647..06d03ee7786da5e6416b23bd960ae68b69e3bf2b 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut
@@ -11,30 +11,35 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object k;
+ object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -2 0 0 0 0];
+dimensions [1 -1 -1 0 0 0 0];
-internalField uniform 0.1;
+internalField uniform 0;
boundaryField
{
+ box
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
floor
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type mutWallFunction;
+ value uniform 0;
}
ceiling
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type mutWallFunction;
+ value uniform 0;
}
fixedWalls
{
- type compressible::kQRWallFunction;
- value uniform 0.1;
+ type mutWallFunction;
+ value uniform 0;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
index add6399d3f9c861d0a916f2cacead83ccd1bde4a..ab64c00e2818ae921e8d7797fd57ddc8e836a70c 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
index ab64c00e2818ae921e8d7797fd57ddc8e836a70c..47d2c425057ca396c6e78d593f3e2a5caefb24ba 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
- format ascii;
+ format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
deleted file mode 100755
index 2954f18bad457db6c7a7a287a2bbeaf5524e6f71..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allclean
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf VTK
-rm -rf constant/cellToRegion constant/polyMesh/sets
-
-# -----------------------------------------------------------------------------
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
index c3c4b5e504a38eb0b761783bd9d0dd0dd4c396eb..9acc76c4435899d0ad892702d7932540dc8174b4 100755
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun
@@ -41,8 +41,7 @@ do
done
# Run
-hostname > system/machines
-runParallel chtMultiRegionFoam 4 system/machines
+runParallel chtMultiRegionFoam 4
# Reconstruct
for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
index 4cada4ce7a6e9b9634aa323ae3a3e5168db1576c..2b77c937a2531f9bb7629ad8f4acc7dd7ff29bfb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -10,11 +10,13 @@ FoamFile
version 2.0;
format ascii;
class uniformDimensionedVectorField;
+ location "constant";
object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -2 0 0 0 0];
-value (0 -9.81 0);
+value ( 0 -9.81 0 );
+
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
new file mode 120000
index 0000000000000000000000000000000000000000..fe0384ff08b952c55e7811f2dc2643afaf6fe706
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
@@ -0,0 +1 @@
+../bottomAir/g
\ No newline at end of file
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/K
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/T
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/U
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/alphat
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/cp
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/epsilon
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/k
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/p
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/rho
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/Allclean
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
similarity index 93%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
index 28b6133b28f996692f991e859675bbbb2212dcd1..5b96ab937d0d0d3fb41119ba514d65ad38a2bc35 100755
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun
@@ -38,8 +38,7 @@ runApplication chtMultiRegionFoam
#done
#
## Run
-#hostname > system/machines
-#runParallel chtMultiRegionFoam 4 system/machines
+#runParallel chtMultiRegionFoam 4
#
## Reconstruct
#for i in bottomAir topAir heater leftSolid rightSolid
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/RASProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/blockMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/boundary
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/regionProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/RASProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/g
new file mode 120000
index 0000000000000000000000000000000000000000..fe0384ff08b952c55e7811f2dc2643afaf6fe706
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/g
@@ -0,0 +1 @@
+../bottomAir/g
\ No newline at end of file
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/thermophysicalProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/turbulenceProperties
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/bottomAir.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/bottomAir.stl
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/heater.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/heater.stl
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/heater.stl
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/heater.stl
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/leftSolid.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/leftSolid.stl
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/rightSolid.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/rightSolid.stl
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/topAir.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/topAir.stl
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/topAir.stl
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/topAir.stl
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/makeCellSets.setSet
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/README b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/README
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/README
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/README
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/snappyHexMeshDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/decomposeParDict
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSchemes
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
similarity index 100%
rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSolution
rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
index f0d118b12b93af769804ed06127c9118af6c35d5..836276fe9cea7a027c4726fa021088bf33d0da6e 100755
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
@@ -3,7 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="MRFSimpleFoam"
+application=`getApplication`
./makeMesh
runApplication $application
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
index 0679f5ee9a89c2aac9fea13532703df1fbf6f3b3..554df2afd61191c9b3b121c440c6fad3d4ceb429 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict
@@ -15,7 +15,16 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General macros to create 2D/extruded-2D meshes
-//define(calc, [esyscmd(echo $1 | bc | tr -d \\n)])
+
+
+
+
+
+
+
+
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,33 +32,283 @@ convertToMeters 0.1;
// Hub radius
+
// Impeller-tip radius
+
// Baffle-tip radius
+
// Tank radius
+
// MRF region radius
+
// Thickness of 2D slab
+
// Base z
+
// Top z
+
// Number of cells radially between hub and impeller tip
+
// Number of cells radially in each of the two regions between
// impeller and baffle tips
+
// Number of cells radially between baffle tip and tank
+
// Number of cells azimuthally in each of the 8 blocks
+
// Number of cells in the thickness of the slab
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
vertices
@@ -161,7 +420,7 @@ vertices
(0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95
);
-blocks
+blocks
(
// block0
hex (0 2 13 12 48 50 61 60)
@@ -433,7 +692,7 @@ edges
arc 94 84 (0.923879532683006 0.382683431950523 0.1)
);
-patches
+patches
(
wall rotor
(
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
index 301f1ff6121a537700aa401fd96617c182ff2702..292f25b806357d9df75c7731f74dee0ec0aa3a40 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,39 +10,37 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
-rotor
-{
- type wall;
- nFaces 192;
- startFace 5952;
-}
-
-stator
-{
- type wall;
- nFaces 192;
- startFace 6144;
-}
-
-front
-{
- type empty;
- nFaces 3072;
- startFace 6336;
-}
-
-back
-{
- type empty;
- nFaces 3072;
- startFace 9408;
-}
+ rotor
+ {
+ type wall;
+ nFaces 192;
+ startFace 5952;
+ }
+ stator
+ {
+ type wall;
+ nFaces 192;
+ startFace 6144;
+ }
+ front
+ {
+ type empty;
+ nFaces 3072;
+ startFace 6336;
+ }
+ back
+ {
+ type empty;
+ nFaces 3072;
+ startFace 9408;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
index 5ee792177a59cc57190f9e5cbbce330143cc4807..34af32827c52f64f9c0f99296856c5d408b17d70 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
index 5ee792177a59cc57190f9e5cbbce330143cc4807..34af32827c52f64f9c0f99296856c5d408b17d70 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun
index d4e6877e32feab36c83ad67cfaac4f3e1e5801fe..05cd6dfdf017c560e257fd4136e11938bbeadf02 100755
--- a/tutorials/incompressible/channelFoam/channel395/Allrun
+++ b/tutorials/incompressible/channelFoam/channel395/Allrun
@@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application directory
-application="channelFoam"
+application=`getApplication`
runApplication blockMesh
runApplication $application
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties
index 8c32bfa67ce64c36026916a7cfe522166062711d..9bcc936fc34053578e2137be0b6ea9475747824b 100644
--- a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties
+++ b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel oneEqEddy;
-turbulence on;
-
printCoeffs on;
delta vanDriest;
diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
index fb95d69234ccdc3f196c973d62dfe18fdd9e69e7..2f0b51717c5e9b66cbb06c6b0ac74e8ac0153b18 100644
--- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
+++ b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index 914e53d07de0af8907cc8a5b56f88778f02a1a76..1a93d4eb327caa21863b16ab13ba1e5e7e0d1af2 100755
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="icoFoam"
cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"
diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
index cc15fe93fcfd889832b45cd9d31b58e296d2b585..61feadd97403fbf58a57c925fc262f3de46ec95a 100644
--- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
index 63b839343e672b74d0e71b5f44f72f5ff24d5f35..8c7162efda85f21e6c171d532acd8c1422b92e9f 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
index cc15fe93fcfd889832b45cd9d31b58e296d2b585..61feadd97403fbf58a57c925fc262f3de46ec95a 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
index 0b3c2049038339d72cfbe8f9690ecb98ce50b2ee..fbdbc176b35e0c489628af5632951f8b8c19f2d4 100644
--- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
+++ b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/incompressible/icoFoam/resetFixedWallsScr b/tutorials/incompressible/icoFoam/resetFixedWallsScr
new file mode 100644
index 0000000000000000000000000000000000000000..5a8d98ce462da5095632a9ad2cd29867838b55e0
--- /dev/null
+++ b/tutorials/incompressible/icoFoam/resetFixedWallsScr
@@ -0,0 +1,8 @@
+/fixedWalls/,/}/{
+/fixedWalls/p
+/{/p
+/type fixedValue;/p
+s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value uniform (0 0 0);/p
+/}/p
+d
+}
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
index 31f0f41f930e16c24a7986182f6d49896e7bf303..7766ed29e4055f9563c235a3770109e51e165fb4 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-left
-{
- type patch;
- nFaces 35;
- startFace 3485;
-}
-
-right
-{
- type patch;
- nFaces 35;
- startFace 3520;
-}
-
-down
-{
- type wall;
- nFaces 40;
- startFace 3555;
-}
-
-up
-{
- type wall;
- nFaces 40;
- startFace 3595;
-}
-
-cylinder
-{
- type wall;
- nFaces 80;
- startFace 3635;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 3600;
- startFace 3715;
-}
+ left
+ {
+ type patch;
+ nFaces 35;
+ startFace 3485;
+ }
+ right
+ {
+ type patch;
+ nFaces 35;
+ startFace 3520;
+ }
+ down
+ {
+ type wall;
+ nFaces 40;
+ startFace 3555;
+ }
+ up
+ {
+ type wall;
+ nFaces 40;
+ startFace 3595;
+ }
+ cylinder
+ {
+ type wall;
+ nFaces 80;
+ startFace 3635;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 3600;
+ startFace 3715;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
index a6e8b86643cf972ce282b9086d884c39843d9c88..62bc7f68e6b67fd5e2e53cbe251d63b964e6a44c 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/incompressible/pisoFoam/Allrun b/tutorials/incompressible/pisoFoam/Allrun
deleted file mode 100755
index 7d6114dd5037f136433502b3d3c2e6112249b10e..0000000000000000000000000000000000000000
--- a/tutorials/incompressible/pisoFoam/Allrun
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="pisoFoam"
-
-rasCases="cavity"
-lesCases="pitzDaily pitzDailyDirectMapped"
-
-computeCase()
-{
- if [ -f Allrun ] ; then
- ./Allrun
- else
- runApplication blockMesh
- runApplication $application
- fi
-}
-
-cd ras
-for case in $rasCases
-do
- cd $case
- computeCase
- cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
- cd $case
- computeCase
- cd ..
-done
-cd ..
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
index 0d948b7ff1b7b9c634f644678edfa869a4261515..034085751aebb376b727c99f0d14c65bcefcb7b5 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties
@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-turbulence on;
-
LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 903f3ef57e0b5ca8acaec1fa58531aaa1e354515..313dcceba1abd7b93d57320c4c674f1734692506 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 03fbddb7a8375fc4806a4441e0151969e3da6944..98d278dccc51f76eea35405e9ca8cdbf017e9342 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -47,10 +47,10 @@ runTimeModifiable yes;
functions
{
- probes1
+ probes
{
type probes;
- functionObjectLibs ( "libsampling.so" );
+ functionObjectLibs ("libsampling.so");
enabled true;
outputControl timeStep;
outputInterval 1;
@@ -74,7 +74,7 @@ functions
fieldAverage1
{
type fieldAverage;
- functionObjectLibs ( "libfieldFunctionObjects.so" );
+ functionObjectLibs ("libfieldFunctionObjects.so");
enabled true;
outputControl outputTime;
fields
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
index d23000a160182734de209f890271050fafedb183..aeb984814c564005dcc12204ed6a005894f2f99f 100755
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="pisoFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
runApplication changeDictionary
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
index 0d948b7ff1b7b9c634f644678edfa869a4261515..034085751aebb376b727c99f0d14c65bcefcb7b5 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties
@@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-turbulence on;
-
LESModel oneEqEddy;
delta cubeRootVol;
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
index 0b56bb9f5e8be426cd22b962d4b254728ac55ab7..fb820c3f431bddc293e836306da8021afe61362f 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -24,6 +24,7 @@ inlet
nFaces 30;
startFace 27238;
sampleMode nearestCell;
+ sampleRegion region0;
samplePatch none;
offset ( 0.0495 0 0 );
}
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
index d68c9a703602f71086c9279a70c87fab73e11c73..61feadd97403fbf58a57c925fc262f3de46ec95a 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
index a657f303ba2353ed03605c9b3e470c48deb3875c..f73c44df8a80af20311035b269db90ae9d88b7ea 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean
@@ -3,3 +3,4 @@
# Clean time folders only
rm -rf *[1-9]*
+rm log.*
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 97fb4bc5910ab159dba94df18b53037f48d22637..411704d7836a4f61312e668b2f93d4ae057a8e22 100755
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@@ -3,6 +3,6 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="simpleFoam"
+application=`getApplication`
runApplication $application
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index 7a2e8906845066b4a1bc85618d616d2b6e2b4fcb..b79c6ad432aaa5f1f3da3b5a4b9561d698e8cdb5 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -21,433 +21,433 @@ FoamFile
{
type patch;
nFaces 320;
- startFace 955219;
+ startFace 1016586;
}
inlet
{
type patch;
nFaces 64;
- startFace 955539;
+ startFace 1016906;
}
outlet
{
type patch;
nFaces 64;
- startFace 955603;
+ startFace 1016970;
}
lowerWall
{
type wall;
nFaces 5330;
- startFace 955667;
+ startFace 1017034;
}
upperWall
{
type patch;
nFaces 160;
- startFace 960997;
+ startFace 1022364;
}
motorBike_frt-fairing:001%1
{
type wall;
- nFaces 9726;
- startFace 961157;
+ nFaces 6626;
+ startFace 1022524;
}
motorBike_windshield:002%2
{
type wall;
- nFaces 86;
- startFace 970883;
+ nFaces 50;
+ startFace 1029150;
}
motorBike_rr-wh-rim:005%5
{
type wall;
- nFaces 186;
- startFace 970969;
+ nFaces 181;
+ startFace 1029200;
}
motorBike_rr-wh-rim:010%10
{
type wall;
- nFaces 355;
- startFace 971155;
+ nFaces 340;
+ startFace 1029381;
}
motorBike_fr-wh-rim:011%11
{
type wall;
- nFaces 594;
- startFace 971510;
+ nFaces 474;
+ startFace 1029721;
}
motorBike_fr-wh-brake-disk:012%12
{
type wall;
- nFaces 55;
- startFace 972104;
+ nFaces 54;
+ startFace 1030195;
}
motorBike_frame:016-shadow%13
{
type wall;
- nFaces 163;
- startFace 972159;
+ nFaces 131;
+ startFace 1030249;
}
motorBike_rear-susp:014%14
{
type wall;
- nFaces 1300;
- startFace 972322;
+ nFaces 1073;
+ startFace 1030380;
}
motorBike_rear-susp:014-shadow%15
{
type wall;
- nFaces 166;
- startFace 973622;
+ nFaces 159;
+ startFace 1031453;
}
motorBike_frame:016%16
{
type wall;
- nFaces 21;
- startFace 973788;
+ nFaces 20;
+ startFace 1031612;
}
motorBike_rr-wh-rim:005-shadow%17
{
type wall;
nFaces 25;
- startFace 973809;
+ startFace 1031632;
}
motorBike_rr-wh-chain-hub:022%22
{
type wall;
- nFaces 161;
- startFace 973834;
+ nFaces 141;
+ startFace 1031657;
}
motorBike_rearseat%24
{
type wall;
- nFaces 543;
- startFace 973995;
+ nFaces 432;
+ startFace 1031798;
}
motorBike_frt-fairing%25
{
type wall;
- nFaces 927;
- startFace 974538;
+ nFaces 626;
+ startFace 1032230;
}
motorBike_windshield%26
{
type wall;
- nFaces 821;
- startFace 975465;
+ nFaces 428;
+ startFace 1032856;
}
motorBike_headlights%27
{
type wall;
- nFaces 280;
- startFace 976286;
+ nFaces 161;
+ startFace 1033284;
}
motorBike_driversseat%28
{
type wall;
- nFaces 457;
- startFace 976566;
+ nFaces 367;
+ startFace 1033445;
}
motorBike_rear-body%29
{
type wall;
- nFaces 3081;
- startFace 977023;
+ nFaces 2076;
+ startFace 1033812;
}
motorBike_fuel-tank%30
{
type wall;
- nFaces 1512;
- startFace 980104;
+ nFaces 912;
+ startFace 1035888;
}
motorBike_exhaust%31
{
type wall;
- nFaces 3516;
- startFace 981616;
+ nFaces 2391;
+ startFace 1036800;
}
motorBike_rr-wh-rim%32
{
type wall;
- nFaces 2128;
- startFace 985132;
+ nFaces 1430;
+ startFace 1039191;
}
motorBike_fr-mud-guard%33
{
type wall;
- nFaces 1096;
- startFace 987260;
+ nFaces 767;
+ startFace 1040621;
}
motorBike_fr-wh-rim%34
{
type wall;
- nFaces 954;
- startFace 988356;
+ nFaces 592;
+ startFace 1041388;
}
motorBike_fr-wh-brake-disk%35
{
type wall;
nFaces 533;
- startFace 989310;
+ startFace 1041980;
}
motorBike_fr-brake-caliper%36
{
type wall;
- nFaces 199;
- startFace 989843;
+ nFaces 164;
+ startFace 1042513;
}
motorBike_fr-wh-tyre%37
{
type wall;
- nFaces 1855;
- startFace 990042;
+ nFaces 1118;
+ startFace 1042677;
}
motorBike_hbars%38
{
type wall;
- nFaces 745;
- startFace 991897;
+ nFaces 535;
+ startFace 1043795;
}
motorBike_fr-forks%39
{
type wall;
- nFaces 1637;
- startFace 992642;
+ nFaces 1144;
+ startFace 1044330;
}
motorBike_chain%40
{
type wall;
- nFaces 484;
- startFace 994279;
+ nFaces 474;
+ startFace 1045474;
}
motorBike_rr-wh-tyre%41
{
type wall;
- nFaces 3022;
- startFace 994763;
+ nFaces 1785;
+ startFace 1045948;
}
motorBike_square-dial%42
{
type wall;
- nFaces 9;
- startFace 997785;
+ nFaces 6;
+ startFace 1047733;
}
motorBike_round-dial%43
{
type wall;
- nFaces 24;
- startFace 997794;
+ nFaces 18;
+ startFace 1047739;
}
motorBike_dial-holder%44
{
type wall;
- nFaces 120;
- startFace 997818;
+ nFaces 87;
+ startFace 1047757;
}
motorBike_rear-susp%45
{
type wall;
- nFaces 2050;
- startFace 997938;
+ nFaces 1787;
+ startFace 1047844;
}
motorBike_rear-brake-lights%46
{
type wall;
- nFaces 75;
- startFace 999988;
+ nFaces 54;
+ startFace 1049631;
}
motorBike_rear-light-bracket%47
{
type wall;
- nFaces 226;
- startFace 1000063;
+ nFaces 163;
+ startFace 1049685;
}
motorBike_frame%48
{
type wall;
- nFaces 2849;
- startFace 1000289;
+ nFaces 2040;
+ startFace 1049848;
}
motorBike_rear-mud-guard%49
{
type wall;
- nFaces 1177;
- startFace 1003138;
+ nFaces 804;
+ startFace 1051888;
}
motorBike_rear-susp-spring-damp%50
{
type wall;
- nFaces 138;
- startFace 1004315;
+ nFaces 125;
+ startFace 1052692;
}
motorBike_fairing-inner-plate%51
{
type wall;
- nFaces 551;
- startFace 1004453;
+ nFaces 446;
+ startFace 1052817;
}
motorBike_clutch-housing%52
{
type wall;
- nFaces 1199;
- startFace 1005004;
+ nFaces 966;
+ startFace 1053263;
}
motorBike_radiator%53
{
type wall;
- nFaces 51;
- startFace 1006203;
+ nFaces 48;
+ startFace 1054229;
}
motorBike_water-pipe%54
{
type wall;
- nFaces 112;
- startFace 1006254;
+ nFaces 103;
+ startFace 1054277;
}
motorBike_water-pump%55
{
type wall;
- nFaces 96;
- startFace 1006366;
+ nFaces 74;
+ startFace 1054380;
}
motorBike_engine%56
{
type wall;
- nFaces 2963;
- startFace 1006462;
+ nFaces 2384;
+ startFace 1054454;
}
motorBike_rear-shock-link%57
{
type wall;
- nFaces 33;
- startFace 1009425;
+ nFaces 29;
+ startFace 1056838;
}
motorBike_rear-brake-fluid-pot-bracket%58
{
type wall;
- nFaces 63;
- startFace 1009458;
+ nFaces 59;
+ startFace 1056867;
}
motorBike_rear-brake-fluid-pot%59
{
type wall;
- nFaces 59;
- startFace 1009521;
+ nFaces 53;
+ startFace 1056926;
}
motorBike_footpeg%60
{
type wall;
- nFaces 103;
- startFace 1009580;
+ nFaces 87;
+ startFace 1056979;
}
motorBike_rr-wh-chain-hub%61
{
type wall;
- nFaces 160;
- startFace 1009683;
+ nFaces 145;
+ startFace 1057066;
}
motorBike_rear-brake-caliper%62
{
type wall;
- nFaces 158;
- startFace 1009843;
+ nFaces 142;
+ startFace 1057211;
}
motorBike_rider-helmet%65
{
type wall;
- nFaces 964;
- startFace 1010001;
+ nFaces 583;
+ startFace 1057353;
}
motorBike_rider-visor%66
{
type wall;
- nFaces 170;
- startFace 1010965;
+ nFaces 95;
+ startFace 1057936;
}
motorBike_rider-boots%67
{
type wall;
- nFaces 1657;
- startFace 1011135;
+ nFaces 1025;
+ startFace 1058031;
}
motorBike_rider-gloves%68
{
type wall;
- nFaces 436;
- startFace 1012792;
+ nFaces 320;
+ startFace 1059056;
}
motorBike_rider-body%69
{
type wall;
- nFaces 7207;
- startFace 1013228;
+ nFaces 4555;
+ startFace 1059376;
}
motorBike_frame:0%70
{
type wall;
- nFaces 52;
- startFace 1020435;
+ nFaces 37;
+ startFace 1063931;
}
motorBike_frt-fairing:001-shadow%74
{
type wall;
- nFaces 1340;
- startFace 1020487;
+ nFaces 1274;
+ startFace 1063968;
}
motorBike_windshield-shadow%75
{
type wall;
- nFaces 111;
- startFace 1021827;
+ nFaces 101;
+ startFace 1065242;
}
motorBike_fr-mud-guard-shadow%81
{
type wall;
- nFaces 135;
- startFace 1021938;
+ nFaces 129;
+ startFace 1065343;
}
motorBike_fr-wh-brake-disk-shadow%83
{
type wall;
nFaces 77;
- startFace 1022073;
+ startFace 1065472;
}
motorBike_rear-mud-guard-shadow%84
{
type wall;
- nFaces 143;
- startFace 1022150;
+ nFaces 138;
+ startFace 1065549;
}
motorBike_rear-susp-spring-damp-shadow%85
{
type wall;
nFaces 15;
- startFace 1022293;
+ startFace 1065687;
}
motorBike_radiator-shadow%86
{
type wall;
nFaces 12;
- startFace 1022308;
+ startFace 1065702;
}
motorBike_rear-shock-link-shadow%87
{
type wall;
nFaces 7;
- startFace 1022320;
+ startFace 1065714;
}
motorBike_rear-brake-fluid-pot-bracket-shadow%88
{
type wall;
nFaces 6;
- startFace 1022327;
+ startFace 1065721;
}
motorBike_rr-wh-chain-hub-shadow%89
{
type wall;
nFaces 24;
- startFace 1022333;
+ startFace 1065727;
}
)
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
index 1006a1e1b6a097c15e9a2b472b67595e1979fa09..b3c3a08e9e91d0c6f3a28cd8d781e0edc5e526c9 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
@@ -1,11 +1,10 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.0 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-
FoamFile
{
version 2.0;
@@ -13,7 +12,6 @@ FoamFile
class dictionary;
object snappyHexMeshDict;
}
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Which of the steps to run
@@ -176,6 +174,8 @@ snapControls
// Settings for the layer addition.
addLayersControls
{
+ relativeSizes true;
+
// Per final patch (so not geometry!) the layer information
layers
{
@@ -460,7 +460,7 @@ addLayersControls
// is the
// thickness of the layer furthest away from the wall.
// Relative to undistorted size of cell outside layer.
- finalLayerRatio 0.3;
+ finalLayerThickness 0.3;
//- Minimum thickness of cell layer. If for any reason layer
// cannot be above minThickness do not add layer.
@@ -504,6 +504,9 @@ addLayersControls
// Create buffer region for new layer terminations
nBufferCellsNoExtrude 0;
+
+ // Overall max number of layer addition iterations
+ nLayerIter 50;
}
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..313dcceba1abd7b93d57320c4c674f1734692506
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+ inlet
+ {
+ type patch;
+ nFaces 30;
+ startFace 24170;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 57;
+ startFace 24200;
+ }
+ upperWall
+ {
+ type wall;
+ nFaces 223;
+ startFace 24257;
+ }
+ lowerWall
+ {
+ type wall;
+ nFaces 250;
+ startFace 24480;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 24450;
+ startFace 24730;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
index 8eb7d98937fcdab8a13949fd6bdc743a0928e6d0..313dcceba1abd7b93d57320c4c674f1734692506 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,43 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
-inlet
-{
- type patch;
- nFaces 30;
- startFace 24170;
-}
-
-outlet
-{
- type patch;
- nFaces 57;
- startFace 24200;
-}
-
-upperWall
-{
- type wall;
- nFaces 223;
- startFace 24257;
-}
-
-lowerWall
-{
- type wall;
- nFaces 250;
- startFace 24480;
-}
-
-frontAndBack
-{
- type empty;
- nFaces 24450;
- startFace 24730;
-}
+ inlet
+ {
+ type patch;
+ nFaces 30;
+ startFace 24170;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 57;
+ startFace 24200;
+ }
+ upperWall
+ {
+ type wall;
+ nFaces 223;
+ startFace 24257;
+ }
+ lowerWall
+ {
+ type wall;
+ nFaces 250;
+ startFace 24480;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 24450;
+ startFace 24730;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..e752d70159b94027c37c5b971dd32dce99977a92
--- /dev/null
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+ inlet
+ {
+ type patch;
+ nFaces 840;
+ startFace 96680;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 840;
+ startFace 97520;
+ }
+ innerWall
+ {
+ type wall;
+ nFaces 2480;
+ startFace 98360;
+ }
+ outerWall
+ {
+ type wall;
+ nFaces 880;
+ startFace 100840;
+ }
+ cyclic
+ {
+ type cyclic;
+ nFaces 3200;
+ startFace 101720;
+ featureCos 0.9;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..8ceda71797d7f7949d6c3233d2c80372837f386e
--- /dev/null
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ top
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ bottom
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ walls
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ symmetry
+ {
+ type symmetryPlane;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
similarity index 65%
rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
index 23851291dc60d3b0df3be887acfbeb0bb5067ef8..c2fd24e8efd4188d36a85f3d3b8d31d3cd5d4630 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut
@@ -11,30 +11,38 @@ FoamFile
format ascii;
class volScalarField;
location "0";
- object epsilon;
+ object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 2 -3 0 0 0 0];
+dimensions [1 -1 -1 0 0 0 0];
-internalField uniform 0.01;
+internalField uniform 0;
boundaryField
{
- floor
+ top
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type mutWallFunction;
+ value uniform 0;
}
- ceiling
+ bottom
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type mutWallFunction;
+ value uniform 0;
}
- fixedWalls
+ walls
{
- type compressible::epsilonWallFunction;
- value uniform 0.01;
+ type mutWallFunction;
+ value uniform 0;
+ }
+ symmetry
+ {
+ type symmetryPlane;
+ }
+ frontAndBack
+ {
+ type empty;
}
}
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
index 907214c9f88bfcbb7588a24963aa40f42a944036..73b806fc21d748ac31df47cc594f15480fec96a8 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/RASProperties
@@ -19,42 +19,6 @@ RASModel kEpsilon;
turbulence on;
-laminarCoeffs
-{
-}
-
-kEpsilonCoeffs
-{
- Cmu 0.09;
- C1 1.44;
- C2 1.92;
- C3 -0.33;
- alphah 1;
- alphak 1;
- alphaEps 0.76923;
-}
-
-RNGkEpsilonCoeffs
-{
-}
-
-LaunderSharmaKECoeffs
-{
-}
-
-LRRCoeffs
-{
-}
-
-LaunderGibsonRSTMCoeffs
-{
-}
-
-wallFunctionCoeffs
-{
- kappa 0.4187;
- E 9;
-}
-
+printCoeffs yes;
// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 7fcb35b37cdbb0c9869e1f8609128292b10628be..9af50d799ded9402ae950b2fbd70e1fcacb5e3fa 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -55,6 +55,7 @@ constantProperties
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Tvap Tvap [ 0 0 0 1 0 ] 400;
+ Tbp Tvap [ 0 0 0 1 0 ] 400;
LDevol LDevol [ 0 0 0 0 0 ] 0;
hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
constantVolume true;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
new file mode 100644
index 0000000000000000000000000000000000000000..b130d7bc0aa5e48e9a785745d71564a71ac9a626
--- /dev/null
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+ top
+ {
+ type wall;
+ nFaces 5;
+ startFace 4855;
+ }
+ bottom
+ {
+ type wall;
+ nFaces 45;
+ startFace 4860;
+ }
+ walls
+ {
+ type wall;
+ nFaces 140;
+ startFace 4905;
+ }
+ symmetry
+ {
+ type symmetryPlane;
+ nFaces 100;
+ startFace 5045;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 5000;
+ startFace 5145;
+ }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
index 9ded4bdec6e16903b476bd71ca332bf8af748d0e..cb015f101f857c660d1c713a3bddcfe491030155 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean
@@ -1,16 +1,12 @@
#!/bin/sh
-set -x
-# remove old cell sets
-rm -rf constant/polyMesh/sets
-foamClearPolyMesh
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-# remove old time folders
-rm -rf 0 *[1-9]*
+cleanCase
-# remove old log files
-rm -f log*
+# remove 0 directory
+rm -rf 0
# copy 0.org to 0
cp -r 0.org 0
-
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 701d55dc28c462b8cc7a2743861adff59feafc64..04eb8794e0cd381b38c3c9f2e77fbe2595364760 100755
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@@ -3,7 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="porousExplicitSourceReactingParcelFoam"
+application=`getApplication`
# create mesh
runApplication blockMesh
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
index 063399d211d5ed531385d746779244fe2a970c8f..2f17b0b095155b651f49dc705e9660b168bd969d 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/pointMassSourcesProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-active false;
+active true;
pointSources
(
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
index 76e55a95ea9d854c439e0880f8f9548284ad34d6..8f4467796d62ec977006d86c36f516486385b852 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties
@@ -51,6 +51,7 @@ constantProperties
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Tvap Tvap [ 0 0 0 1 0 ] 273;
+ Tbp Tvap [ 0 0 0 1 0 ] 373;
constantVolume false;
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1 b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
similarity index 64%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1
rename to tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
index 8e28c332b7e7f109d001bb341f718c6495a7d660..52fb40b02fe95b7588dc161c88be79fccf39aa19 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary
@@ -1,37 +1,34 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
- class volScalarField;
- object alpha1;
+ class polyBoundaryMesh;
+ location "constant/polyMesh";
+ object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- front
+2
+(
+ walls
{
- type empty;
+ type wall;
+ nFaces 80;
+ startFace 760;
}
- back
+ frontAndBack
{
type empty;
+ nFaces 800;
+ startFace 840;
}
- walls
- {
- type zeroGradient;
- }
-}
+)
// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
index ca03722b1cc634848a57607c2583bbf86f60461a..fa4bbd94e64d78ede917910128b33781139a6f36 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties
@@ -21,10 +21,6 @@ radiationModel none;
solverFreq 10;
-noRadiation
-{
-}
-
P1Coeffs
{
C C [ 0 0 0 0 0 0 0 ] 0;
@@ -49,7 +45,10 @@ binaryAbsorptionEmissionCoeffs
absorptionEmissionModel cloudAbsorptionEmission;
cloudAbsorptionEmissionCoeffs
{
- cloudNames ( coalCloud1 limestoneCloud1 );
+ cloudNames
+ (
+ reactingCloud1
+ );
}
}
}
@@ -58,7 +57,10 @@ scatterModel cloudScatter;
cloudScatterCoeffs
{
- cloudNames ( coalCloud1 limestoneCloud1 );
+ cloudNames
+ (
+ reactingCloud1
+ );
}
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
index 6a53da3143fdf612841edcd3042fd4a4f2b68737..38aa2b9837e2f8e8de79d683ae39d9e5a1e1e6af 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties
@@ -51,6 +51,7 @@ constantProperties
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Tvap Tvap [ 0 0 0 1 0 ] 273;
+ Tbp Tvap [ 0 0 0 1 0 ] 373;
constantVolume false;
}
@@ -72,7 +73,7 @@ integrationSchemes
particleForces
{
- gravity on;
+ gravity off;
virtualMass off;
pressureGradient off;
}
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index 9aa53af3ade983cc2a4b52d7d197a73775aa7320..9b8fb0ea7f281ff4eb92636da47bde5de522993c 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -23,13 +23,13 @@ startTime 0;
stopAt endTime;
-endTime 1;
+endTime 0.5;
-deltaT 0.001;
+deltaT 1e-03;
writeControl adjustableRunTime;
-writeInterval 0.1;
+writeInterval 0.05;
purgeWrite 0;
@@ -49,7 +49,7 @@ adjustTimeStep yes;
maxCo 0.3;
-maxDeltaT 1e-3;
+maxDeltaT 1e-03;
// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
index 294428ed7bf29edbbb1b08f5ae8ceba909903285..6811ddc336d653847955862ee0dd34582a41835f 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution
@@ -33,8 +33,8 @@ solvers
}
p
{
- solver PBiCG;
- preconditioner DILU;
+ solver PCG;
+ preconditioner DIC;
tolerance 1e-06;
relTol 0;
}
@@ -52,13 +52,6 @@ solvers
tolerance 1e-06;
relTol 0;
}
- CO2
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
O2
{
solver PBiCG;
@@ -73,20 +66,6 @@ solvers
tolerance 1e-06;
relTol 0;
}
- CH4
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
- H2
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
H2O
{
solver PBiCG;
@@ -94,13 +73,6 @@ solvers
tolerance 1e-06;
relTol 0;
}
- CO
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-06;
- relTol 0;
- }
h
{
solver PBiCG;
@@ -108,13 +80,6 @@ solvers
tolerance 1e-05;
relTol 0;
}
- R
- {
- solver PBiCG;
- preconditioner DILU;
- tolerance 1e-05;
- relTol 0;
- }
k
{
solver PBiCG;
@@ -133,7 +98,7 @@ solvers
PISO
{
- transonic yes;
+ transonic no;
nCorrectors 2;
nNonOrthogonalCorrectors 0;
momentumPredictor yes;
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
new file mode 100644
index 0000000000000000000000000000000000000000..8ceda71797d7f7949d6c3233d2c80372837f386e
--- /dev/null
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object alphat;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ top
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ bottom
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ walls
+ {
+ type compressible::alphatWallFunction;
+ value uniform 0;
+ }
+ symmetry
+ {
+ type symmetryPlane;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut
new file mode 100644
index 0000000000000000000000000000000000000000..c2fd24e8efd4188d36a85f3d3b8d31d3cd5d4630
--- /dev/null
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [1 -1 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ top
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ bottom
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ walls
+ {
+ type mutWallFunction;
+ value uniform 0;
+ }
+ symmetry
+ {
+ type symmetryPlane;
+ }
+ frontAndBack
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater b/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater
new file mode 120000
index 0000000000000000000000000000000000000000..4d5b442c46882d7c8ba25761411a8b920d937e8e
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater
@@ -0,0 +1 @@
+../../heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater
\ No newline at end of file
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
index ced7047d4380f08357a48ce9fdfe03b6eb1d5e70..841cfca2e6cd7038e9ee559110fd50692f8946a6 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0.org/p
@@ -20,23 +20,24 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type fixedValue;
value uniform 0;
}
- walls
+ walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- defaultFaces
+ defaultFaces
{
type empty;
}
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
index 339131c645888b81cf06d6cf1231bf94f330f608..e247f867f53c57370c021fc7090f8385057d8d18 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/0/p
@@ -16,7 +16,7 @@ FoamFile
dimensions [1 -1 -2 0 0 0 0];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
1875
(
6296.13
@@ -1899,23 +1899,24 @@ internalField nonuniform List<scalar>
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type fixedValue;
value uniform 0;
}
- walls
+ walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- defaultFaces
+ defaultFaces
{
type empty;
}
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
index 70c4c3d9afc3c0c0e2e4362cd9feb781f4cd9f56..56e0a545c15839416fcd3beca616ce0f609c5879 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index 45b6257d4bfdcf4cbd57f3300b75a38209c053e5..c6b98bda754e16c0a63cee7214e4ce817626bab1 100755
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@@ -3,6 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
+# Set application name
application="cavitatingFoam"
refineMeshByCellSet()
@@ -35,8 +36,7 @@ cd throttle3D
mapFields ../throttle -sourceTime latestTime >& log.mapFields
runApplication decomposePar
- hostname > system/machines
- runParallel $application 4 system/machines
+ runParallel $application 4
runApplication reconstructPar
cd ..
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
index b16fea4ab2fb0e04dcbe2d821bf1b77c1f5eb3a5..583bb948964bbf8d164ff2da1da6600d27ae24cf 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel oneEqEddy;
-turbulence on;
-
delta smooth;
laminarCoeffs
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
index b2c07faf58570d3ca814e6ea0b4f1697eca466a6..f401f8d162d966efdefbc063cd557893734d35da 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 51;
- startFace 15151;
+ startFace 57362;
}
outlet
{
type patch;
nFaces 51;
- startFace 15202;
+ startFace 57413;
}
walls
{
type wall;
- nFaces 436;
- startFace 15253;
+ nFaces 836;
+ startFace 57464;
}
frontBack
{
type empty;
- nFaces 15420;
- startFace 15689;
+ nFaces 57540;
+ startFace 58300;
}
)
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
index b16fea4ab2fb0e04dcbe2d821bf1b77c1f5eb3a5..583bb948964bbf8d164ff2da1da6600d27ae24cf 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel oneEqEddy;
-turbulence on;
-
delta smooth;
laminarCoeffs
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
index adffe02dd45cd472f937c168e19da397fa4b5792..e48eb3773be70a12e8999832841da6c03accd700 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 510;
- startFace 220900;
+ startFace 4413730;
}
outlet
{
type patch;
nFaces 510;
- startFace 221410;
+ startFace 4414240;
}
walls
{
type wall;
- nFaces 4360;
- startFace 221920;
+ nFaces 37840;
+ startFace 4414750;
}
frontBack
{
type wall;
- nFaces 15420;
- startFace 226280;
+ nFaces 57540;
+ startFace 4452590;
}
)
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 0a3298e8e84123a662d334ac2603f043cc9a0713..7f095c44f177400ba70afa234433b5a9aae1602f 100755
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@@ -3,7 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="cavitatingFoam"
+application=`getApplication`
refineMeshByCellSet()
{
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
index 59f24d80d0f357d27a4b9bfd10777011d610ffa8..03d26bcf3c96c86ca8ecf11604193892ebc80d29 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -21,25 +21,25 @@ FoamFile
{
type patch;
nFaces 51;
- startFace 15151;
+ startFace 57362;
}
outlet
{
type patch;
nFaces 51;
- startFace 15202;
+ startFace 57413;
}
walls
{
type wall;
- nFaces 436;
- startFace 15253;
+ nFaces 836;
+ startFace 57464;
}
frontBack
{
type empty;
- nFaces 15420;
- startFace 15689;
+ nFaces 57540;
+ startFace 58300;
}
)
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d976dd8e9473e71311d044ddf2a7067c8aea2690
Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz differ
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz
new file mode 100644
index 0000000000000000000000000000000000000000..62a7129895c73d18cbc620886a4eed5adf6b334e
Binary files /dev/null and b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz differ
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
index f2a0345d68b030bcac62302fb71d10da0a137384..a3d54875d4a261e0a14965700a18eb81bb7a568e 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
cp 0/alpha1.org 0/alpha1
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties
index dd76a64b4322ec34e9f1ad69d99f59864483e211..14b6ce249d6815c46519a43956116bd9cd2e7a3b 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel laminar;
-turbulence off;
-
delta cubeRootVol;
laminarCoeffs
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary
index 52529b0c3d5075ad4224ad57b495a8f91cda9eaf..9eb64e86375de42fb8dda163fccc2cf75d8dd9a5 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-09ca1eb6b56f |
-| \\ / A nd | |
-| \\/ M anipulation | www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index 7b9b11445e018536c908fa896212a19c7c92eef3..695ef4d671a213fe27b4b2235133c729c6ccc83a 100755
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@@ -2,14 +2,13 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
cp 0/alpha1.org 0/alpha1
cp 0/p.org 0/p
runApplication setFields
runApplication decomposePar
-hostname > system/machines
-runParallel $application 4 system/machines
+runParallel $application 4
runApplication reconstructPar
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties
index dd76a64b4322ec34e9f1ad69d99f59864483e211..14b6ce249d6815c46519a43956116bd9cd2e7a3b 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel laminar;
-turbulence off;
-
delta cubeRootVol;
laminarCoeffs
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary
index f3c84ef8fbdd9331d89e5698db346553c27425d6..b16c01a16fea85f17a672ab359809ce757d4ddc9 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary
@@ -1,9 +1,9 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-09ca1eb6b56f |
-| \\ / A nd | |
-| \\/ M anipulation | www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
index b3a944b216d11d7644902b0a094403caa9507154..5149e924344f890408a186326f93225045942185 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p
@@ -22,12 +22,14 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
obstacle
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
index b3a944b216d11d7644902b0a094403caa9507154..5149e924344f890408a186326f93225045942185 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p
@@ -22,12 +22,14 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
obstacle
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk
deleted file mode 100644
index af03eba46538789965e6f8ab0137eb890e833a2b..0000000000000000000000000000000000000000
Binary files a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/VTK/c0/c0_1.vtk and /dev/null differ
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary
index 924d99d9373a00ca40e7b97192e8911704e94737..8122fa3f3ad6951cf8c4984f9eaa3706b1cb131c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
index c69b424dc75602864a806fc737b9f17d4017de74..db8d5ad9f6314775f468015c7925b17630f960a8 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p
@@ -30,7 +30,8 @@ boundaryField
}
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
index c7d3ee2dcd51f0c5fa1b35f42cdbcc6d79e30493..4a938bd66e4089a28194757029873e21e985d5da 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
-
-
-
+
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
index 53b37c41f6d9efc89d3a51c6c2425a165026e2dc..067ff53cc9865662f18fb8c2f2fb21a1e3975db0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index 2da46048d747ed03cd3cb0a3f6cee8a97bf8a884..b8d66af38a39bd74446f93916ec3da797f4754a6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -56,7 +56,7 @@ functions
probes
{
type probes;
- functionObjectLibs ( "libsampling.so" );
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 1;
probeLocations
@@ -73,7 +73,7 @@ functions
wallPressure
{
type surfaces;
- functionObjectLibs ( "libsampling.so" );
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 10;
surfaceFormat raw;
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
index c69b424dc75602864a806fc737b9f17d4017de74..db8d5ad9f6314775f468015c7925b17630f960a8 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p
@@ -30,7 +30,8 @@ boundaryField
}
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
index c7d3ee2dcd51f0c5fa1b35f42cdbcc6d79e30493..4a938bd66e4089a28194757029873e21e985d5da 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
-
-
-
+
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
index 53b37c41f6d9efc89d3a51c6c2425a165026e2dc..067ff53cc9865662f18fb8c2f2fb21a1e3975db0 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index c0adba94fbaae1c9bc3bd2d612f5078e18a083b6..b8d66af38a39bd74446f93916ec3da797f4754a6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -56,9 +56,9 @@ functions
probes
{
type probes;
- name probes;
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
- outputInterval 10;
+ outputInterval 1;
probeLocations
(
( 0 9.95 19.77 )
@@ -73,7 +73,7 @@ functions
wallPressure
{
type surfaces;
- functionObjectLibs ( "libsampling.so" );
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 10;
surfaceFormat raw;
@@ -81,6 +81,7 @@ functions
(
p
);
+
surfaces
(
walls
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
index d27ad70eb9ed4cdf91ec9cf25222554b271898e7..ce3e974b7eed321b040b27d6ae3c7ac7f1234f0b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p
@@ -22,7 +22,8 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
index 98820d1a0069d2fb15abd412722b3b18d51be5f1..da310caafc1a6865bc3d595ca95b53b4b94dbaf5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
-
-
-
+
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
index 31c74e19c2e09fdc21361f3b94abc32f9b151784..20d992ff424ee9092f7398349d633c85c3dcfb21 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 08aaf802e19170ffa1b1cf9f97a25fbbe6f8355a..a3b08d083bb28e0fef209ccc9d0852b85c20d462 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -56,7 +56,7 @@ functions
probes
{
type probes;
- name probes;
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 1;
probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
index d27ad70eb9ed4cdf91ec9cf25222554b271898e7..ce3e974b7eed321b040b27d6ae3c7ac7f1234f0b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p
@@ -22,7 +22,8 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
index 98820d1a0069d2fb15abd412722b3b18d51be5f1..da310caafc1a6865bc3d595ca95b53b4b94dbaf5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
-
-
-
+
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
index 31c74e19c2e09fdc21361f3b94abc32f9b151784..20d992ff424ee9092f7398349d633c85c3dcfb21 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 08aaf802e19170ffa1b1cf9f97a25fbbe6f8355a..a3b08d083bb28e0fef209ccc9d0852b85c20d462 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
probes
{
type probes;
- name probes;
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 1;
probeLocations
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
index d27ad70eb9ed4cdf91ec9cf25222554b271898e7..ce3e974b7eed321b040b27d6ae3c7ac7f1234f0b 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p
@@ -22,7 +22,8 @@ boundaryField
{
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
index 98820d1a0069d2fb15abd412722b3b18d51be5f1..da310caafc1a6865bc3d595ca95b53b4b94dbaf5 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict
@@ -15,9 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// General m4 macros
-
-
-
+
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
index 31c74e19c2e09fdc21361f3b94abc32f9b151784..20d992ff424ee9092f7398349d633c85c3dcfb21 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 08aaf802e19170ffa1b1cf9f97a25fbbe6f8355a..a3b08d083bb28e0fef209ccc9d0852b85c20d462 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -56,7 +56,7 @@ functions
probes
{
type probes;
- name probes;
+ functionObjectLibs ("libsampling.so");
outputControl timeStep;
outputInterval 1;
probeLocations
diff --git a/tutorials/multiphase/interFoam/Allrun b/tutorials/multiphase/interFoam/Allrun
deleted file mode 100755
index 91f49e0a7fb9296f6c2e86fb695cddf6afed2c9f..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/interFoam/Allrun
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="interFoam"
-
-laminarCases="damBreak"
-rasCases="damBreak"
-lesCases="nozzleFlow2D"
-
-computeCase()
-{
- if [ -f Allrun ] ; then
- ./Allrun
- else
- runApplication blockMesh
- runApplication changeDictionary
- runApplication $application
- fi
-}
-
-cd laminar
-for case in $laminarCases
-do
- cd $case
- computeCase
- cd ..
-done
-cd ..
-
-cd ras
-for case in $rasCases
-do
- cd $case
- computeCase
- cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
- cd $case
- computeCase
- cd ..
-done
-cd ..
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
index e8e310bf86a0faa6481cf8e4284b6fbfaf5780ce..99a20900eb96f8f71086983851443c0afa6b1155 100755
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
@@ -3,7 +3,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="MRFInterFoam"
+application=`getApplication`
-./makeMesh
+runApplication ./makeMesh
runApplication $application
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 9f2498ca887fea00a9140b6040c71c3725055240..03ffbeecde3c00d170e416054f8dfb99a544b4cb 100755
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
+# Set application name
application="interFoam"
setDamBreakFine ()
@@ -42,7 +42,6 @@ cd damBreakFine
runApplication blockMesh
runApplication setFields
runApplication decomposePar
- hostname > system/machines
- runParallel $application 4 system/machines
+ runParallel $application 4
runApplication reconstructPar
cd ..
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/p b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
index 15ab9897a899264f52a2cfb792b0fc6c39324dc4..f8cc9e9f25446476e6d5f8496759a76f71a32c4b 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p
@@ -22,17 +22,20 @@ boundaryField
{
leftWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
rightWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
lowerWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 8f801cc9ce5e42414767aed367a048d7c0c4e6fa..655eb4c8874e3c19195c318867379af30162833f 100755
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`
runRefineMesh ()
{
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
index 1d34e2477f47060c279bf8bfc559ec77f7861540..c4072e231d795e2e5997ea71f619cdb53658219c 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
@@ -17,8 +17,6 @@ FoamFile
LESModel oneEqEddy;
-turbulence on;
-
delta smooth;
printCoeffs on;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
index cc4838bb42562f758f1e7ef0527ecc2453c61256..e5e1a3c5c9d5594271ca38de4824d3f4de481778 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "system";
- object cellSetDict;
+ object cellSetDict.2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index e222cf7e15d05f8a2f8d11bb3e86ba15491bffd2..c01559fc7760107018a2ad7d0d65f79866915e35 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -2,7 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="rasInterFoam"
+# Set application name
+application="interFoam"
setDamBreakFine ()
{
@@ -37,7 +38,6 @@ cd damBreakFine
runApplication blockMesh
runApplication setFields
runApplication decomposePar
- hostname > system/machines
- runParallel $application 4 system/machines
+ runParallel $application 4
runApplication reconstructPar
cd ..
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
new file mode 100644
index 0000000000000000000000000000000000000000..3d75dba791a9190111b2c0f04a712349ba20319d
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nut
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class volScalarField;
+ location "0";
+ object nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 2 -1 0 0 0 0];
+
+internalField uniform 0;
+
+boundaryField
+{
+ leftWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ rightWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ lowerWall
+ {
+ type nutWallFunction;
+ value uniform 0;
+ }
+ atmosphere
+ {
+ type calculated;
+ value uniform 0;
+ }
+ defaultFaces
+ {
+ type empty;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/p b/tutorials/multiphase/interFoam/ras/damBreak/0/p
index 15ab9897a899264f52a2cfb792b0fc6c39324dc4..f8cc9e9f25446476e6d5f8496759a76f71a32c4b 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/p
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p
@@ -22,17 +22,20 @@ boundaryField
{
leftWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
rightWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
lowerWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 599b286f3d8c59b6088fe4f778773443e63bf0ee..90917ec79581d50caa94e093fdaa403d30cc1032 100755
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@@ -2,8 +2,8 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`
runApplication blockMesh
runApplication setFields
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
index ef32a0cb80e14d93c11446dcdaad610b64e78367..41c06d5f3f4d03c47e0a53a8d3008451786eda15 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,43 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
-leftWall
-{
- type wall;
- nFaces 50;
- startFace 4432;
-}
-
-rightWall
-{
- type wall;
- nFaces 50;
- startFace 4482;
-}
-
-lowerWall
-{
- type wall;
- nFaces 62;
- startFace 4532;
-}
-
-atmosphere
-{
- type patch;
- nFaces 46;
- startFace 4594;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 4536;
- startFace 4640;
-}
+ leftWall
+ {
+ type wall;
+ nFaces 50;
+ startFace 4432;
+ }
+ rightWall
+ {
+ type wall;
+ nFaces 50;
+ startFace 4482;
+ }
+ lowerWall
+ {
+ type wall;
+ nFaces 62;
+ startFace 4532;
+ }
+ atmosphere
+ {
+ type patch;
+ nFaces 46;
+ startFace 4594;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 4536;
+ startFace 4640;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
index 4d7076770a7025f7837ad1500ca81c8e271eda52..a0f116ae898be6d1c40a24645156f269200ce7a0 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
index 15ab9897a899264f52a2cfb792b0fc6c39324dc4..f8cc9e9f25446476e6d5f8496759a76f71a32c4b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p
@@ -22,17 +22,20 @@ boundaryField
{
leftWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
rightWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
lowerWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
index ef32a0cb80e14d93c11446dcdaad610b64e78367..41c06d5f3f4d03c47e0a53a8d3008451786eda15 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,43 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
-leftWall
-{
- type wall;
- nFaces 50;
- startFace 4432;
-}
-
-rightWall
-{
- type wall;
- nFaces 50;
- startFace 4482;
-}
-
-lowerWall
-{
- type wall;
- nFaces 62;
- startFace 4532;
-}
-
-atmosphere
-{
- type patch;
- nFaces 46;
- startFace 4594;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 4536;
- startFace 4640;
-}
+ leftWall
+ {
+ type wall;
+ nFaces 50;
+ startFace 4432;
+ }
+ rightWall
+ {
+ type wall;
+ nFaces 50;
+ startFace 4482;
+ }
+ lowerWall
+ {
+ type wall;
+ nFaces 62;
+ startFace 4532;
+ }
+ atmosphere
+ {
+ type patch;
+ nFaces 46;
+ startFace 4594;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 4536;
+ startFace 4640;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
index 99b42c75e49ba5edd07719ba748e7a3ae1647807..4184b5fb204db59760fe1b648d62d88156f59250 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
index 15ab9897a899264f52a2cfb792b0fc6c39324dc4..f8cc9e9f25446476e6d5f8496759a76f71a32c4b 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p
@@ -22,17 +22,20 @@ boundaryField
{
leftWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
rightWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
lowerWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
atmosphere
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
index 2f9b3db7acc9151144e7a002b338db62b9fa2fc2..a19f18a1fd2c4376a5b6178546667e399bc0251d 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
@@ -20,33 +20,35 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type fixedValue;
value uniform 0;
}
- bottomWall
+ bottomWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- endWall
+ endWall
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- top
+ top
{
type symmetryPlane;
}
- frontAndBack
+ frontAndBack
{
type empty;
}
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 430ad36dbf3835d14c54dad7324f707c53e0ca04..5723f355b5e64de30ce5da0a044ab5930ab505ec 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-inlet
-{
- type patch;
- nFaces 40;
- startFace 15760;
-}
-
-outlet
-{
- type patch;
- nFaces 4;
- startFace 15800;
-}
-
-bottomWall
-{
- type patch;
- nFaces 200;
- startFace 15804;
-}
-
-endWall
-{
- type wall;
- nFaces 36;
- startFace 16004;
-}
-
-top
-{
- type symmetryPlane;
- nFaces 200;
- startFace 16040;
-}
-
-frontAndBack
-{
- type empty;
- nFaces 16000;
- startFace 16240;
-}
+ inlet
+ {
+ type patch;
+ nFaces 40;
+ startFace 15760;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 4;
+ startFace 15800;
+ }
+ bottomWall
+ {
+ type patch;
+ nFaces 200;
+ startFace 15804;
+ }
+ endWall
+ {
+ type wall;
+ nFaces 36;
+ startFace 16004;
+ }
+ top
+ {
+ type symmetryPlane;
+ nFaces 200;
+ startFace 16040;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 16000;
+ startFace 16240;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
index d12a70117220789fdee39b841afbdff8eb7c8fc7..02b3ad272c3c63ab0a2715ddb5e8ceb8d6e10291 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
@@ -20,102 +20,115 @@ internalField uniform 0;
boundaryField
{
- SYMP3
+ SYMP3
{
type symmetryPlane;
}
- INLE1
+ INLE1
{
type zeroGradient;
}
- OUTL9
+ OUTL9
{
type zeroGradient;
}
- OUTL10
+ OUTL10
{
type zeroGradient;
}
- OUTL11
+ OUTL11
{
type zeroGradient;
}
- OUTL12
+ OUTL12
{
type zeroGradient;
}
- WALL6
+ WALL6
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL8
+ WALL8
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL61
+ WALL61
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL62
+ WALL62
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL63
+ WALL63
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL64
+ WALL64
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL65
+ WALL65
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL66
+ WALL66
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL67
+ WALL67
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL68
+ WALL68
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL69
+ WALL69
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL7
+ WALL7
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- WALL70
+ WALL70
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- OUTL15
+ OUTL15
{
type fixedValue;
value uniform 0;
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
index a657f303ba2353ed03605c9b3e470c48deb3875c..f73c44df8a80af20311035b269db90ae9d88b7ea 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
@@ -3,3 +3,4 @@
# Clean time folders only
rm -rf *[1-9]*
+rm log.*
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
index 1ce228b8f6ae08528288e869a5d917fbc140c21b..231be442622d847cae8c39a1d8d6d7c849ed59ee 100755
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@@ -2,7 +2,7 @@
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application="settlingFoam"
+application=`getApplication`
#runApplication blockMesh
runApplication $application
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
index 6dc161ca6f10f039cf0351548c0257f572ae2455..9c8370323fefb4dd8f9200d87d9fc95a7b5bf513 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/0/p
@@ -22,7 +22,8 @@ boundaryField
{
bottom
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
top
@@ -33,7 +34,8 @@ boundaryField
walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
frontBack
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
index 3ffe9620745d4567e5ae108d6ac500729b060004..14035ec47a51bc282829102855d164fa106463e2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format binary;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
index a861e9875c9bd40ca9e83718ce5708062aa4f382..56005a65f519ee1c73b35817914a998ccccf6e50 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-8cbffd16687e |
+| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
index 339131c645888b81cf06d6cf1231bf94f330f608..e247f867f53c57370c021fc7090f8385057d8d18 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/0/p
@@ -16,7 +16,7 @@ FoamFile
dimensions [1 -1 -2 0 0 0 0];
-internalField nonuniform List<scalar>
+internalField nonuniform List<scalar>
1875
(
6296.13
@@ -1899,23 +1899,24 @@ internalField nonuniform List<scalar>
boundaryField
{
- inlet
+ inlet
{
type zeroGradient;
}
- outlet
+ outlet
{
type fixedValue;
value uniform 0;
}
- walls
+ walls
{
- type zeroGradient;
+ type buoyantPressure;
+ value uniform 0;
}
- defaultFaces
+ defaultFaces
{
type empty;
}
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
index cdffeb226bc16209c5ae612ff1c0b0454a1f92f4..56e0a545c15839416fcd3beca616ce0f609c5879 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,39 +10,37 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
-inlet
-{
- type patch;
- nFaces 25;
- startFace 3650;
-}
-
-outlet
-{
- type patch;
- nFaces 25;
- startFace 3675;
-}
-
-walls
-{
- type wall;
- nFaces 150;
- startFace 3700;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 3750;
- startFace 3850;
-}
+ inlet
+ {
+ type patch;
+ nFaces 25;
+ startFace 3650;
+ }
+ outlet
+ {
+ type patch;
+ nFaces 25;
+ startFace 3675;
+ }
+ walls
+ {
+ type wall;
+ nFaces 150;
+ startFace 3700;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 3750;
+ startFace 3850;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
index e58f9c592199047d4b405f36d62a6e61c1e53cb5..1d54b63e6baaae7d31bb4b66a8c8d071e50f9bdb 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,53 +10,49 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
-left
-{
- type symmetryPlane;
- nFaces 30;
- startFace 1930;
-}
-
-right
-{
- type patch;
- nFaces 30;
- startFace 1960;
-}
-
-down
-{
- type symmetryPlane;
- nFaces 30;
- startFace 1990;
-}
-
-up
-{
- type patch;
- nFaces 30;
- startFace 2020;
-}
-
-hole
-{
- type patch;
- nFaces 20;
- startFace 2050;
-}
-
-frontAndBack
-{
- type empty;
- nFaces 2000;
- startFace 2070;
-}
+ left
+ {
+ type symmetryPlane;
+ nFaces 30;
+ startFace 1930;
+ }
+ right
+ {
+ type patch;
+ nFaces 30;
+ startFace 1960;
+ }
+ down
+ {
+ type symmetryPlane;
+ nFaces 30;
+ startFace 1990;
+ }
+ up
+ {
+ type patch;
+ nFaces 30;
+ startFace 2020;
+ }
+ hole
+ {
+ type patch;
+ nFaces 20;
+ startFace 2050;
+ }
+ frontAndBack
+ {
+ type empty;
+ nFaces 2000;
+ startFace 2070;
+ }
)
// ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
index 89fde8381b1ddf14da9877e5200080ce7bfc34ad..bc163bf797a6863452af4d36f74943c73551a210 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,46 +10,43 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
+ location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
-topSurface
-{
- type patch;
- nFaces 6;
- startFace 16;
-}
-
-bottomSurface
-{
- type patch;
- nFaces 6;
- startFace 22;
-}
-
-fixedEnd
-{
- type wall;
- nFaces 2;
- startFace 28;
-}
-
-tractionEnd
-{
- type patch;
- nFaces 2;
- startFace 30;
-}
-
-defaultFaces
-{
- type empty;
- nFaces 24;
- startFace 32;
-}
+ topSurface
+ {
+ type patch;
+ nFaces 6;
+ startFace 16;
+ }
+ bottomSurface
+ {
+ type patch;
+ nFaces 6;
+ startFace 22;
+ }
+ fixedEnd
+ {
+ type wall;
+ nFaces 2;
+ startFace 28;
+ }
+ tractionEnd
+ {
+ type patch;
+ nFaces 2;
+ startFace 30;
+ }
+ defaultFaces
+ {
+ type empty;
+ nFaces 24;
+ startFace 32;
+ }
)
// ************************************************************************* //