Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev

README

@@ -2,7 +2,7 @@
 #
 #+TITLE:             *OpenFOAM README for version 1.5*
 #+AUTHOR:                      OpenCFD Ltd.
-#+DATE:                        10 July 2008
+#+DATE:                        14 July 2008
 #+LINK:                  http://www.opencfd.co.uk
 #+OPTIONS: author:nil
 
@@ -21,7 +21,39 @@
   administrator.
 
   If the user wishes to run OpenFOAM in 32/64-bit mode they should consult the
-  appendix "A. Running OpenFOAM in 32-bit mode".
+  section "Running OpenFOAM in 32-bit mode".
+
+*** Qt (from http://trolltech.com/products/qt)
+    The ParaView 3.3 visualisation package requires that Qt version 4.3.x MUST
+    be installed on the system.  Earlier or more recent versions (4.2.x or
+    4.4.x) will NOT work.  To check whether Qt4 is installed, and the version,
+    type:
+    + qmake --version
+
+    The ParaView binary executables in the ThirdParty distribution will only
+    work with PRECISELY the same version of Qt with which it was compiled.  The
+    64-bit version of ParaView was compiled with Qt-4.3.1 (with openSuSE-10.3)
+    and the 32-bit version of ParaView was compiled with Qt-4.3.2 (with
+    ubuntu-7.10).  If the user finds that a ParaView binary fails to run, then
+    it is almost certainly due to a conflict in compiled and installed Qt
+    versions and they will need to consult the section below on "Compiling
+    ParaView and the PV3FoamReader module."
+
+    The default versions of Qt used by some GNU/Linux releases are as follows.
+    + ubuntu-7.10:   Version 4.3.2
+    + ubuntu-8.04:   Version 4.3.4
+    + openSuSE-10.2: Version 4.2.1 - too old
+    + openSuSE-10.3: Version 4.3.1
+    + openSuSE-11.0: Version 4.4.0 - too new
+
+    Compilation and running of ParaView has been successful using the libraries
+    downloaded in the "libqt4-dev" package on ubuntu.
+
+    If you don't have an appropriate version of Qt installed you can download
+    the sources from TrollTech e.g.:
+    ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.5.tar.bz2
+    and compile and install in /usr/local or some other location that does to
+    conflict with the pre-installed version.
 
 * Installation
   Download and unpack the files in the $HOME/OpenFOAM directory as described in:
@@ -42,7 +74,7 @@
     Then update the environment variables by sourcing the $HOME/.bashrc file by
     typing in the terminal:
 
-	+ . $HOME/.bashrc
+    + . $HOME/.bashrc
 
   2) OR, if running tcsh or csh, source the etc/cshrc file by adding the
     following line to the end of your $HOME/.cshrc file:
@@ -52,7 +84,7 @@
     Then update the environment variables by sourcing the $HOME/.cshrc file by
     typing in the terminal:
 
-	+ source $HOME/.cshrc
+    + source $HOME/.cshrc
 
 *** Installation in alternative locations
     OpenFOAM may also be installed in alternative locations. However, the
@@ -62,13 +94,13 @@
     The environment variable 'FOAM_INST_DIR' can be used to find and source the
     appropriate resource file. Here is a bash/ksh/sh example:
 
-	+ export FOAM_INST_DIR=/data/app/OpenFOAM
+    + export FOAM_INST_DIR=/data/app/OpenFOAM
     + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
     + [ -f $foamDotFile ] && . $foamDotFile
 
     and a csh/tcsh example:
 
-	+ setenv FOAM_INST_DIR /data/app/OpenFOAM
+    + setenv FOAM_INST_DIR /data/app/OpenFOAM
     + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
     + if ( -f $foamDotFile ) source $foamDotFile
 
@@ -121,6 +153,22 @@
   + cd $HOME/OpenFOAM/${USER}-${WM_PROJECT_VERSION}/run/tutorials/icoFoam/cavity
   + blockMesh
   + icoFoam
+  + paraFoam
+
+* Compiling Paraview 3.3 and the PV3FoamReader module
+  A version of Qt 4.3.x must be installed to compile ParaView.  The compilation
+  is a fairly simple process using the supplied buildParaView3.3-cvs script that
+  has worked is our tests with other packages supplied in the ThirdParty
+  directory, namely cmake-2.4.6 and gcc-4.3.1.  Execute the following:
+  + cd $FOAM_INST_DIR/ThirdParty
+  + rm -rf ParaView3.3-cvs/platforms
+  + buildParaView3.3-cvs
+
+  The PV3FoamReader module is an OpenFOAM utility that can be compiled in the
+  usual manner as follows:
+  + cd $FOAM_UTILITIES/postProcessing/graphics/PV3FoamReader
+  + ./Allwclean
+  + ./Allwmake
 
 * Documentation
   http://www.OpenFOAM.org/doc
@@ -135,7 +183,5 @@
   Linux users with a 64-bit machine may install either the OpenFOAM 32-bit
   version (linux) or the OpenFOAM 64-bit version (linux64), or both.  The 64-bit
   is the default mode on a 64-bit machine.  To use an installed 32-bit version,
-  the user must set the environment variable $WM_32 (to anything, e.g. "on")
-  before sourcing the etc/bashrc (or etc/cshrc) file.  Unsetting WM_32 and
-  re-sourcing the etc/bashrc (or etc/cshrc) file will set up the user to run in
-  64-bit mode.
+  the user must set the environment variable WM_ARCH_OPTION to 32 before
+  sourcing the etc/bashrc (or etc/cshrc) file.

README.html

@@ -6,7 +6,7 @@ lang="en" xml:lang="en">
 <title><b>OpenFOAM README for version 1.5</b></title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="10 July 2008"/>
+<meta name="generated" content="14 July 2008"/>
 <meta name="author" content="OpenCFD Ltd."/>
 <style type="text/css">
   html {
@@ -41,7 +41,11 @@ lang="en" xml:lang="en">
 <div id="text-table-of-contents">
 <ul>
 <li><a href="#sec-1">1 Copyright</a></li>
-<li><a href="#sec-2">2 System requirements</a></li>
+<li><a href="#sec-2">2 System requirements</a>
+<ul>
+<li><a href="#sec-2.1">2.1 Qt (from http://trolltech.com/products/qt)</a></li>
+</ul>
+</li>
 <li><a href="#sec-3">3 Installation</a>
 <ul>
 <li><a href="#sec-3.1">3.1 Installation in alternative locations</a></li>
@@ -50,10 +54,11 @@ lang="en" xml:lang="en">
 <li><a href="#sec-4">4 Building from Sources (Optional)</a></li>
 <li><a href="#sec-5">5 Testing the installation</a></li>
 <li><a href="#sec-6">6 Getting Started</a></li>
-<li><a href="#sec-7">7 Documentation</a></li>
-<li><a href="#sec-8">8 Help</a></li>
-<li><a href="#sec-9">9 Reporting Bugs in OpenFOAM</a></li>
-<li><a href="#sec-10">10 Running OpenFOAM in 32-bit mode on 64-bit machines</a></li>
+<li><a href="#sec-7">7 Compiling Paraview 3.3 and the PV3FoamReader module</a></li>
+<li><a href="#sec-8">8 Documentation</a></li>
+<li><a href="#sec-9">9 Help</a></li>
+<li><a href="#sec-10">10 Reporting Bugs in OpenFOAM</a></li>
+<li><a href="#sec-11">11 Running OpenFOAM in 32-bit mode on 64-bit machines</a></li>
 </ul>
 </div>
 </div>
@@ -84,8 +89,67 @@ administrator.
 </p>
 <p>
 If the user wishes to run OpenFOAM in 32/64-bit mode they should consult the
-appendix "A. Running OpenFOAM in 32-bit mode".
+section "Running OpenFOAM in 32-bit mode".
 </p>
+
+</div>
+
+<div id="outline-container-2.1" class="outline-3">
+<h3 id="sec-2.1">2.1 Qt (from <a href="http://trolltech.com/products/qt">http://trolltech.com/products/qt</a>)</h3>
+<div id="text-2.1">
+
+<p>The ParaView 3.3 visualisation package requires that Qt version 4.3.x MUST
+be installed on the system.  Earlier or more recent versions (4.2.x or
+4.4.x) will NOT work.  To check whether Qt4 is installed, and the version,
+type:
+</p><ul>
+<li>
+qmake &ndash;version
+
+</li>
+</ul>
+
+<p>The ParaView binary executables in the ThirdParty distribution will only
+work with PRECISELY the same version of Qt with which it was compiled.  The
+64-bit version of ParaView was compiled with Qt-4.3.1 (with openSuSE-10.3)
+and the 32-bit version of ParaView was compiled with Qt-4.3.2 (with
+ubuntu-7.10).  If the user finds that a ParaView binary fails to run, then
+it is almost certainly due to a conflict in compiled and installed Qt
+versions and they will need to consult the section below on "Compiling
+ParaView and the PV3FoamReader module."
+</p>
+<p>
+The default versions of Qt used by some GNU/Linux releases are as follows.
+</p><ul>
+<li>
+ubuntu-7.10:   Version 4.3.2
+</li>
+<li>
+ubuntu-8.04:   Version 4.3.4
+</li>
+<li>
+openSuSE-10.2: Version 4.2.1 - too old
+</li>
+<li>
+openSuSE-10.3: Version 4.3.1
+</li>
+<li>
+openSuSE-11.0: Version 4.4.0 - too new
+
+</li>
+</ul>
+
+<p>Compilation and running of ParaView has been successful using the libraries
+downloaded in the "libqt4-dev" package on ubuntu.
+</p>
+<p>
+If you don't have an appropriate version of Qt installed you can download
+the sources from TrollTech e.g.:
+<a href="ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.5.tar.bz2">ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.5.tar.bz2</a>
+and compile and install in /usr/local or some other location that does to
+conflict with the pre-installed version.
+</p>
+</div>
 </div>
 
 </div>
@@ -285,6 +349,9 @@ blockMesh
 </li>
 <li>
 icoFoam
+</li>
+<li>
+paraFoam
 
 </li>
 </ul>
@@ -293,18 +360,57 @@ icoFoam
 </div>
 
 <div id="outline-container-7" class="outline-2">
-<h2 id="sec-7">7 Documentation</h2>
+<h2 id="sec-7">7 Compiling Paraview 3.3 and the PV3FoamReader module</h2>
 <div id="text-7">
 
+<p>A version of Qt 4.3.x must be installed to compile ParaView.  The compilation
+is a fairly simple process using the supplied buildParaView3.3-cvs script that
+has worked is our tests with other packages supplied in the ThirdParty
+directory, namely cmake-2.4.6 and gcc-4.3.1.  Execute the following:
+</p><ul>
+<li>
+cd $FOAM_INST_DIR/ThirdParty
+</li>
+<li>
+rm -rf ParaView3.3-cvs/platforms
+</li>
+<li>
+buildParaView3.3-cvs
+
+</li>
+</ul>
+
+<p>The PV3FoamReader module is an OpenFOAM utility that can be compiled in the
+usual manner as follows:
+</p><ul>
+<li>
+cd $FOAM_UTILITIES/postProcessing/graphics/PV3FoamReader
+</li>
+<li>
+./Allwclean
+</li>
+<li>
+./Allwmake
+
+</li>
+</ul>
+</div>
+
+</div>
+
+<div id="outline-container-8" class="outline-2">
+<h2 id="sec-8">8 Documentation</h2>
+<div id="text-8">
+
 <p><a href="http://www.OpenFOAM.org/doc">http://www.OpenFOAM.org/doc</a>
 </p>
 </div>
 
 </div>
 
-<div id="outline-container-8" class="outline-2">
-<h2 id="sec-8">8 Help</h2>
-<div id="text-8">
+<div id="outline-container-9" class="outline-2">
+<h2 id="sec-9">9 Help</h2>
+<div id="text-9">
 
 <p><a href="http://www.OpenFOAM.org">http://www.OpenFOAM.org</a> <a href="http://www.OpenFOAM.org/discussion.html">http://www.OpenFOAM.org/discussion.html</a>
 </p>
@@ -312,9 +418,9 @@ icoFoam
 
 </div>
 
-<div id="outline-container-9" class="outline-2">
-<h2 id="sec-9">9 Reporting Bugs in OpenFOAM</h2>
-<div id="text-9">
+<div id="outline-container-10" class="outline-2">
+<h2 id="sec-10">10 Reporting Bugs in OpenFOAM</h2>
+<div id="text-10">
 
 <p><a href="http://www.OpenFOAM.org/bugs.html">http://www.OpenFOAM.org/bugs.html</a>
 </p>
@@ -322,20 +428,18 @@ icoFoam
 
 </div>
 
-<div id="outline-container-10" class="outline-2">
-<h2 id="sec-10">10 Running OpenFOAM in 32-bit mode on 64-bit machines</h2>
-<div id="text-10">
+<div id="outline-container-11" class="outline-2">
+<h2 id="sec-11">11 Running OpenFOAM in 32-bit mode on 64-bit machines</h2>
+<div id="text-11">
 
 <p>Linux users with a 64-bit machine may install either the OpenFOAM 32-bit
 version (linux) or the OpenFOAM 64-bit version (linux64), or both.  The 64-bit
 is the default mode on a 64-bit machine.  To use an installed 32-bit version,
 the user must set the environment variable $WM_32 (to anything, e.g. "on")
-before sourcing the etc/bashrc (or etc/cshrc) file.  Unsetting WM_32 and
-re-sourcing the etc/bashrc (or etc/cshrc) file will set up the user to run in
-64-bit mode.
+before sourcing the etc/bashrc (or etc/cshrc) file.
 </p></div>
 </div>
-<div id="postamble"><p class="date"> Date: 10 July 2008</p>
+<div id="postamble"><p class="date"> Date: 14 July 2008</p>
 <p>HTML generated by org-mode 6.05a in emacs 23<p>
 </div></body>
 </html>

ReleaseNotes-1.5

@@ -2,7 +2,7 @@
 #
 #+TITLE:          *OpenFOAM release notes for version 1.5*
 #+AUTHOR:                      OpenCFD Ltd.
-#+DATE:                        10 July 2008
+#+DATE:                        14 July 2008
 #+LINK:                  http://www.opencfd.co.uk
 #+OPTIONS: author:nil
 
@@ -30,11 +30,11 @@
 * 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
+  + 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
-    $WM\_COMPILER\_INST environment variable in the OpenFOAM-1.5/etc/settings.sh
+    $WM_COMPILER_INST environment variable in the OpenFOAM-1.5/etc/settings.sh
     (or settings.csh) file.
 
 * Developments to solvers (applications)
@@ -131,9 +131,9 @@
     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.
+    - 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

ReleaseNotes-1.5.html

@@ -6,7 +6,7 @@ lang="en" xml:lang="en">
 <title><b>OpenFOAM release notes for version 1.5</b></title>
 <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"/>
 <meta name="generator" content="Org-mode"/>
-<meta name="generated" content="10 July 2008"/>
+<meta name="generated" content="14 July 2008"/>
 <meta name="author" content="OpenCFD Ltd."/>
 <style type="text/css">
   html {
@@ -423,7 +423,7 @@ benefits for larger number of processors.
 </ul>
 </div>
 </div>
-<div id="postamble"><p class="date"> Date: 10 July 2008</p>
+<div id="postamble"><p class="date"> Date: 14 July 2008</p>
 <p>HTML generated by org-mode 6.05a in emacs 23<p>
 </div></body>
 </html>

applications/solvers/heatTransfer/buoyantFoam/pEqn.H

@@ -55,5 +55,6 @@ if (closedVolume)
 {
     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
         /fvc::domainIntegrate(thermo->psi());
+    pd == p - (rho*gh + pRef);
     rho = thermo->rho();
 }

applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H

@@ -1,6 +1,7 @@
 volScalarField rUA = 1.0/UEqn().A();
 U = rUA*UEqn().H();
 UEqn.clear();
+
 phi = fvc::interpolate(rho)*(fvc::interpolate(U) & mesh.Sf());
 bool closedVolume = adjustPhi(phi, U, p);
 phi -= fvc::interpolate(rho*gh*rUA)*fvc::snGrad(rho)*mesh.magSf();
@@ -46,6 +47,7 @@ if (closedVolume)
 {
     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
         /fvc::domainIntegrate(thermo->psi());
+    pd == p - (rho*gh + pRef);
 }
 
 rho = thermo->rho();

applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/pEqn.H

@@ -46,6 +46,7 @@ if (closedVolume)
 {
     p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
         /fvc::domainIntegrate(thermo->psi());
+    pd == p - (rho*gh + pRef);
 }
 
 rho = thermo->rho();

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -51,7 +51,7 @@
                 )
               - fvc::domainIntegrate(thermof[i].psi()*thermof[i].p())
             )/fvc::domainIntegrate(thermof[i].psi());
-
+        pdf[i] == thermof[i].p() - (rhof[i]*ghf[i] + pRef);
         rhof[i] = thermof[i].rho();
     }
 

applications/solvers/multiphase/interDyMFoam/UEqn.H

@@ -1,29 +1,34 @@
-    surfaceScalarField muf = twoPhaseProperties.muf();
+surfaceScalarField muEff
+(
+    "muEff",
+    twoPhaseProperties.muf()
+  + fvc::interpolate(rho*turbulence->nut())
+);
 
-    fvVectorMatrix UEqn
+fvVectorMatrix UEqn
+(
+    fvm::ddt(rho, U)
+  + fvm::div(rhoPhi, U)
+  - fvm::laplacian(muEff, U)
+  - (fvc::grad(U) & fvc::grad(muEff))
+//- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
+);
+
+UEqn.relax();
+
+if (momentumPredictor)
+{
+    solve
     (
-        fvm::ddt(rho, U)
-      + fvm::div(rhoPhi, U)
-      - fvm::laplacian(muf, U)
-      - (fvc::grad(U) & fvc::grad(muf))
-    //- fvc::div(muf*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
-    );
-
-    UEqn.relax();
-
-    if (momentumPredictor)
-    {
-        solve
+        UEqn
+      ==
+        fvc::reconstruct
         (
-            UEqn
-         ==
-            fvc::reconstruct
             (
-                (
-                    fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-                  - ghf*fvc::snGrad(rho)
-                  - fvc::snGrad(pd)
-                ) * mesh.magSf()
-            )
-        );
-    }
+                fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
+              - ghf*fvc::snGrad(rho)
+              - fvc::snGrad(pd)
+            )*mesh.magSf()
+        )
+    );
+}

applications/utilities/mesh/conversion/plot3dToFoam/plot3dToFoam.C

@@ -28,7 +28,8 @@ Description
     Work in progress! Handles ascii multiblock (and optionally singleBlock)
     format.
     By default expects blanking. Use -noBlank if none.
-    Use -2D <thickness> if 2D.
+    Use -2D @a thickness if 2D.
+
     Niklas Nordin has experienced a problem with lefthandedness of the blocks.
     The code should detect this automatically - see hexBlock::readPoints but
     if this goes wrong just set the blockHandedness_ variable to 'right'

applications/utilities/mesh/generation/blockMesh/Make/files

@@ -26,6 +26,6 @@ blockPoints.C
 blockCells.C
 blockBoundary.C
 
-genBlockMesh.C
+blockMeshApp.C
 
 EXE = $(FOAM_APPBIN)/blockMesh

applications/utilities/mesh/generation/blockMesh/addOptions.H

@@ -1,3 +1,4 @@
     argList::noParallel();
     argList::validOptions.insert("blockTopology", "");
+    argList::validOptions.insert("dict", "dictionary");
 #   include "addRegionOption.H"

applications/utilities/mesh/generation/blockMesh/blockMeshApp.C

@@ -77,11 +77,21 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Reading block mesh description dictionary" << endl;
 
+    word dictName("blockMeshDict");
+    fileName dictPath(runTime.constant()/polyMeshDir);
+
+    if (args.options().found("dict"))
+    {
+        fileName userDict(args.options()["dict"]);
+
+        dictName = userDict.name();
+        dictPath = userDict.path();
+    }
+
     IOobject meshDescriptionIOobject
     (
-        "blockMeshDict",
-        runTime.constant(),
-        polyMeshDir,
+        dictName,
+        dictPath,
         runTime,
         IOobject::MUST_READ,
         IOobject::NO_WRITE,
@@ -91,13 +101,14 @@ int main(int argc, char *argv[])
     if (!meshDescriptionIOobject.headerOk())
     {
         FatalErrorIn(args.executable())
-            << "Cannot open mesh description file " << nl
-            << runTime.constant()/polyMeshDir/"blockMeshDict" << nl
+            << "Cannot open mesh description file: " << nl
+            << dictPath/dictName << nl
             << exit(FatalError);
     }
 
     IOdictionary meshDescription(meshDescriptionIOobject);
 
+
     Info<< nl << "Creating block mesh" << endl;
 
     blockMesh blocks(meshDescription);

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -1,10 +1,8 @@
 EXE_LIBS = \
-    -lautoMesh \
     -lbasicThermophysicalModels \
     -lchemistryModel \
     -lcombustionThermophysicalModels \
     -lcompressibleLESModels \
-    -lcompressibleRASModels \
     -ldecompositionMethods \
     -ldieselSpray \
     -ldynamicFvMesh \
@@ -17,6 +15,7 @@ EXE_LIBS = \
     -lfvMotionSolvers \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
+    -lcompressibleRASModels \
     -lincompressibleRASModels \
     -linterfaceProperties \
     -llagrangianIntermediate \
@@ -39,5 +38,5 @@ EXE_LIBS = \
     -lspecie \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
-    -ltriSurface
-
+    -ltriSurface \
+    -lautoMesh

applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml

@@ -90,52 +90,6 @@
             <BooleanDomain name="bool"/>
         </IntVectorProperty>
 
-<!-- Time step edit box -->
-<!-- OLESEN
-<IntVectorProperty
-            name="TimeStepRangeInfo"
-            command="GetTimeStepRange"
-            information_only="1">
-            <SimpleIntInformationHelper/>
-        </IntVectorProperty>
-        <IntVectorProperty
-            name="TimeStep"
-            command="SetTimeStep"
-            number_of_elements="1"
-            animateable="1"
-            default_values="0"
-            information_property="TimestepValues">
-            <IntRangeDomain
-                name="range">
-                <RequiredProperties>
-                    <Property name="TimeStepRangeInfo"
-                              function="Range"/>
-                </RequiredProperties>
-            </IntRangeDomain>
-        </IntVectorProperty>
--->
-
-<!-- Time step limits boxes -->
-<!--        <IntVectorProperty
-            name="TimeStepLimitsInfo"
-            command="GetTimeStepLimits"
-            information_only="1">
-            <SimpleIntInformationHelper/>
-        </IntVectorProperty>
-        <IntVectorProperty
-            name="TimeStepLimits"
-            command="SetTimeStepLimits"
-            number_of_elements="2"
-            default_values="2 5" >
-            <IntRangeDomain
-                name="range">
-                <RequiredProperties>
-                    <Property name="TimeStepLimitsInfo"
-                              function="Range"/>
-                </RequiredProperties>
-            </IntRangeDomain>
-        </IntVectorProperty>-->
-
 <!-- Available regions array -->
         <StringVectorProperty
             name="RegionArrayInfo"
@@ -233,7 +187,9 @@
         </StringVectorProperty>
 
 <!-- Available times array -->
-<!--        <StringVectorProperty
+<!-- PV3FOAM_TIMESELECTION must be defined when compiling vtkPV3Foam
+     might discard this in the future
+        <StringVectorProperty
             name="TimeArrayInfo"
             information_only="1">
             <ArraySelectionInformationHelper
@@ -255,6 +211,8 @@
                 </RequiredProperties>
             </ArraySelectionDomain>
         </StringVectorProperty>
+
+PV3FOAM_TIMESELECTION
 -->
 
     </SourceProxy>

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/Make/options

@@ -1,4 +1,5 @@
 EXE_INC = \
+    /* -DPV3FOAM_TIMESELECTION */ \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C

@@ -27,8 +27,6 @@ License
 #include "vtkPV3Foam.H"
 
 // Foam includes
-#include "argList.H"
-#include "JobInfo.H"
 #include "Time.H"
 #include "fvMesh.H"
 #include "IOobjectList.H"
@@ -176,11 +174,7 @@ void Foam::vtkPV3Foam::resetCounters()
 
 void Foam::vtkPV3Foam::initializeTime()
 {
-    if (debug)
-    {
-        Info<< "entered Foam::vtkPV3Foam::initializeTime" << endl;
-    }
-
+#ifdef PV3FOAM_TIMESELECTION
     Time& runTime = dbPtr_();
 
     // Get times list
@@ -206,6 +200,7 @@ void Foam::vtkPV3Foam::initializeTime()
             times[timeI].name().c_str()
         );
     }
+#endif /* PV3FOAM_TIMESELECTION */
 }
 
 
@@ -213,8 +208,8 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::setTime("
-            << requestedTime << ")" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::setTime(" << requestedTime << ")"
+            << endl;
     }
 
     Time& runTime = dbPtr_();
@@ -249,12 +244,14 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
         found = true;
     }
 
+    runTime.setTime(times[nearestIndex], nearestIndex);
+
     if (debug)
     {
-        Info<< "Selecting time " << times[nearestIndex].name() << endl;
+        Info<< "<end> Foam::vtkPV3Foam::setTime() - selected time "
+            << times[nearestIndex].name() << endl;
     }
 
-    runTime.setTime(times[nearestIndex], nearestIndex);
     return found;
 }
 
@@ -263,7 +260,7 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateSelectedRegions" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateSelectedRegions" << endl;
     }
 
     vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@@ -281,10 +278,15 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
 
         if (debug)
         {
-            Info<< "region " << regionId
-                << " = " << selectedRegions_[regionId] << endl;
+            Info<< "  region[" << regionId << "] = "
+                << selectedRegions_[regionId]
+                << " : " << arraySelection->GetArrayName(regionId) << endl;
         }
     }
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateSelectedRegions" << endl;
+    }
 }
 
 
@@ -294,13 +296,14 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
     const bool firstWord
 )
 {
-    if (debug)
-    {
-        Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
-    }
-
     stringList selections(arraySelection->GetNumberOfArrays());
     label nElem = 0;
+
+    if (debug)
+    {
+        Info << "selections(";
+    }
+
     forAll (selections, elemI)
     {
         if (arraySelection->GetArraySetting(elemI))
@@ -316,16 +319,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
             {
                 selections[nElem] = arraySelection->GetArrayName(elemI);
             }
+
+            if (debug)
+            {
+                Info << " " << selections[nElem];
+            }
+
             ++nElem;
         }
     }
 
-    selections.setSize(nElem);
     if (debug)
     {
-        Info<< "Active array: " << selections << endl;
+        Info << " )" << endl;
     }
 
+    selections.setSize(nElem);
     return selections;
 }
 
@@ -337,14 +346,14 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
     const bool firstWord
 )
 {
-    if (debug)
-    {
-        Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
-    }
-
     stringList selections(selector.size());
     label nElem = 0;
 
+    if (debug)
+    {
+        Info << "selections(";
+    }
+
     for
     (
         int regionId = selector.start();
@@ -366,16 +375,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
                 selections[nElem] = arraySelection->GetArrayName(regionId);
             }
 
+            if (debug)
+            {
+                Info << " " << selections[nElem];
+            }
+
             ++nElem;
         }
     }
 
-    selections.setSize(nElem);
     if (debug)
     {
-        Info<< "Active array: " << selections << endl;
+        Info << " )" << endl;
     }
 
+
+    selections.setSize(nElem);
     return selections;
 }
 
@@ -386,9 +401,9 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
     const stringList& selections
 )
 {
-    if (debug)
+    if (debug > 1)
     {
-        Info<< "entered Foam::vtkPV3Foam::setSelectedArrayEntries" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::setSelectedArrayEntries" << endl;
     }
     const label nEntries = arraySelection->GetNumberOfArrays();
 
@@ -398,7 +413,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
     // Loop through entries, setting values from selectedEntries
     forAll (selections, elemI)
     {
-        if (debug)
+        if (debug > 1)
         {
             Info<< "selections[" << elemI << "] = " << selections[elemI]
                 << endl;
@@ -410,7 +425,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
 
             if (arrayName == selections[elemI])
             {
-                if (debug)
+                if (debug > 1)
                 {
                     Info<< "enabling array: " << arrayName << " Index = "
                         << i
@@ -425,6 +440,10 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
             }
         }
     }
+    if (debug > 1)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::setSelectedArrayEntries" << endl;
+    }
 }
 
 
@@ -455,8 +474,7 @@ Foam::vtkPV3Foam::vtkPV3Foam
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::vtkPV3Foam with "
-            << FileName << endl;
+        Info<< "Foam::vtkPV3Foam::vtkPV3Foam - " << FileName << endl;
     }
 
     // avoid argList and get rootPath/caseName directly from the file
@@ -471,6 +489,22 @@ Foam::vtkPV3Foam::vtkPV3Foam
         fullCasePath = cwd();
     }
 
+    // Set the case as an environment variable - some BCs might use this
+    if (fullCasePath.name().find("processor", 0) == 0)
+    {
+        setEnv("FOAM_CASE", fullCasePath.path(), true);
+    }
+    else
+    {
+        setEnv("FOAM_CASE", fullCasePath, true);
+    }
+
+    if (debug)
+    {
+        Info<< "fullCasePath=" << fullCasePath << nl
+            << "FOAM_CASE=" << getEnv("FOAM_CASE") << endl;
+    }
+
     // Create time object
     dbPtr_.reset
     (
@@ -504,7 +538,7 @@ Foam::vtkPV3Foam::~vtkPV3Foam()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::~vtkPV3Foam" << endl;
+        Info<< "<end> Foam::vtkPV3Foam::~vtkPV3Foam" << endl;
     }
 
     if (meshPtr_)
@@ -521,7 +555,7 @@ void Foam::vtkPV3Foam::UpdateInformation()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::UpdateInformation" << nl
+        Info<< "<beg> Foam::vtkPV3Foam::UpdateInformation - "
             << "TimeStep = " << reader_->GetTimeStep() << endl;
     }
 
@@ -575,6 +609,12 @@ void Foam::vtkPV3Foam::UpdateInformation()
 
     // Update lagrangian field array
     updateInformationLagrangianFields();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::UpdateInformation" << endl;
+    }
+
 }
 
 
@@ -585,8 +625,8 @@ void Foam::vtkPV3Foam::Update
 {
     if (debug)
     {
-        cout<< "entered Foam::vtkPV3Foam::Update" << nl
-             <<"Update\n";
+        cout<< "<beg> Foam::vtkPV3Foam::Update" << nl
+            <<"Update\n";
         output->Print(cout);
 
         cout<<"Internally:\n";
@@ -596,7 +636,6 @@ void Foam::vtkPV3Foam::Update
     }
 
 
-
     // Set up region selection(s)
     updateSelectedRegions();
 
@@ -673,15 +712,16 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
     int nTimes = 0;
     double* ts = NULL;
 
-    vtkDataArraySelection* arraySelection = reader_->GetTimeSelection();
-
     if (dbPtr_.valid())
     {
         Time& runTime = dbPtr_();
 
         instantList times = runTime.times();
+
+#ifdef PV3FOAM_TIMESELECTION
         List<bool> selected = List<bool>(times.size(), false);
 
+        vtkDataArraySelection* arraySelection = reader_->GetTimeSelection();
         const label nSelectedTimes = arraySelection->GetNumberOfArrays();
 
         for (int i = 0; i < nSelectedTimes; ++i)
@@ -694,20 +734,21 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
              && timeI < times.size()
             )
             {
-#if 0
-                Info<<"timeSelection["
-                    << i
-                    <<"] = "
-                    << arraySelection->GetArraySetting(i)
-                    << " is "
-                    << arraySelection->GetArrayName(i) << endl;
-#endif
+                if (debug > 1)
+                {
+                    Info<<"timeSelection["
+                        << i
+                        <<"] = "
+                        << arraySelection->GetArraySetting(i)
+                            << " is "
+                        << arraySelection->GetArrayName(i) << endl;
+                }
                 selected[timeI] = true;
                 ++nTimes;
             }
         }
 
-        if (debug)
+        if (debug > 1)
         {
             Info<< "selected " << nTimes << " times ";
             Info<< "found " << times.size() << " times: (";
@@ -732,6 +773,27 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
                 }
             }
         }
+
+#else /* PV3FOAM_TIMESELECTION */
+        // always skip "constant" time, unless there are no other times
+        nTimes = times.size();
+        label timeI = 0;
+
+        if (nTimes > 1)
+        {
+            timeI = 1;
+            --nTimes;
+        }
+
+        if (nTimes)
+        {
+            ts = new double[nTimes];
+            for (label stepI = 0; stepI < nTimes; ++stepI, ++timeI)
+            {
+                ts[stepI] = times[timeI].value();
+            }
+        }
+#endif /* PV3FOAM_TIMESELECTION */
     }
     else
     {
@@ -741,7 +803,7 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
         }
     }
 
-    // return length via the parameter
+    // return vector length via the parameter
     nTimeSteps = nTimes;
 
     return ts;
@@ -755,7 +817,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
 
     if (debug)
     {
-        Info<< "addPatchNames()" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addPatchNames" << endl;
     }
 
     const fvMesh& mesh = *meshPtr_;
@@ -773,7 +835,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
 
     if (debug)
     {
-        Info<<"patches: " << selectedPatches <<endl;
+        Info<<"... add patches: " << selectedPatches <<endl;
     }
 
     // Find the total number of zones
@@ -787,7 +849,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
 
     if (debug)
     {
-        Info<< "determining patch zones" << endl;
+        Info<< "... determining patch zones" << endl;
     }
 
     // Loop through all patches to determine zones, and centre of each zone
@@ -926,6 +988,11 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
 
     // Resize the patch names list to the actual number of patch names added
     patchTextActorsPtrs_.setSize(globalZoneI);
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addPatchNames)" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C

@@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addFaceSetMesh
 {
     if (debug)
     {
-        Info<< "entered add face set internal mesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
     }
 
     // Construct primitivePatch of faces in fSet.
@@ -96,6 +96,11 @@ void Foam::vtkPV3Foam::addFaceSetMesh
 
     vtkmesh->SetPolys(vtkcells);
     vtkcells->Delete();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
+    }
 }
 
 // ************************************************************************* //

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C

@@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
 {
     if (debug)
     {
-        Info<< "entered addFaceZoneMesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
     }
 
     // Construct primitivePatch of faces in fSet.
@@ -94,6 +94,11 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
 
     vtkmesh->SetPolys(vtkcells);
     vtkcells->Delete();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H

@@ -64,7 +64,7 @@ Foam::label Foam::vtkPV3Foam::addFields
         {
             if (debug)
             {
-                Info<<"add region " << GeoField::typeName
+                Info<<"    addField to GUI " << GeoField::typeName
                     << ":" << fields[fieldI] << endl;
             }
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C

@@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
 {
     if (debug)
     {
-        Info<< "entered add Lagrangian mesh with timePath "
+        Info<< "<beg> Foam::vtkPV3Foam::addLagrangianMesh - timePath "
             << mesh.time().timePath()/"lagrangian" << endl;
     }
 
@@ -61,7 +61,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
 
     if (debug && cloudDirs.size())
     {
-        Info<< "check cloudDirs: " << cloudDirs << endl;
+        Info<< "... check cloudDirs: " << cloudDirs << endl;
     }
 
     bool foundCloud = false;
@@ -99,6 +99,11 @@ void Foam::vtkPV3Foam::addLagrangianMesh
             vtkpoints->Delete();
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addLagrangianMesh" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C

@@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addPatchMesh
 {
     if (debug)
     {
-        Info<< "Adding patch: " << p.name() << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
     }
 
     // Convert Foam mesh vertices to VTK
@@ -84,6 +84,11 @@ void Foam::vtkPV3Foam::addPatchMesh
 
     vtkmesh->SetPolys(vtkcells);
     vtkcells->Delete();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C

@@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addPointSetMesh
 {
     if (debug)
     {
-        Info<< "entered add point set mesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addPointSetMesh" << endl;
     }
 
     const pointField& meshPoints = mesh.points();
@@ -62,6 +62,11 @@ void Foam::vtkPV3Foam::addPointSetMesh
 
     vtkmesh->SetPoints(vtkpoints);
     vtkpoints->Delete();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addPointSetMesh" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C

@@ -46,7 +46,7 @@ void Foam::vtkPV3Foam::addPointZoneMesh
 {
     if (debug)
     {
-        Info<< "entered add point zone mesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
     }
 
     const pointField& meshPoints = mesh.points();
@@ -61,6 +61,11 @@ void Foam::vtkPV3Foam::addPointZoneMesh
 
     vtkmesh->SetPoints(vtkpoints);
     vtkpoints->Delete();
+
+    if (debug)
+    {
+        Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C

@@ -54,7 +54,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
 {
     if (debug)
     {
-        Info<< "entered add volume mesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::addVolumeMesh" << endl;
     }
 
     // Number of additional points needed by the decomposition of polyhedra
@@ -74,13 +74,13 @@ void Foam::vtkPV3Foam::addVolumeMesh
     // and cells
     if (debug)
     {
-        Info<< "building cell-shapes" << endl;
+        Info<< "... building cell-shapes" << endl;
     }
     const cellShapeList& cellShapes = mesh.cellShapes();
 
     if (debug)
     {
-        Info<< "scanning" << endl;
+        Info<< "... scanning" << endl;
     }
     forAll(cellShapes, cellI)
     {
@@ -133,7 +133,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
 
     if (debug)
     {
-        Info<< "converting points" << endl;
+        Info<< "... converting points" << endl;
     }
 
     // Convert Foam mesh vertices to VTK
@@ -150,7 +150,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
 
     if (debug)
     {
-        Info<< "converting cells" << endl;
+        Info<< "... converting cells" << endl;
     }
 
     vtkmesh->Allocate(mesh.nCells() + nAddCells);
@@ -350,6 +350,11 @@ void Foam::vtkPV3Foam::addVolumeMesh
 
     vtkmesh->SetPoints(vtkpoints);
     vtkpoints->Delete();
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::addVolumeMesh" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C

@@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::convertMeshVolume
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshVolume" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshVolume" << endl;
     }
 
     const selectionInfo& selector = selectInfoVolume_;
@@ -88,6 +88,11 @@ void Foam::vtkPV3Foam::convertMeshVolume
         selectedRegionDatasetIds_[regionId] = datasetId;
         vtkmesh->Delete();
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshVolume" << endl;
+    }
 }
 
 
@@ -98,7 +103,7 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
     }
 
     const selectionInfo& selector = selectInfoLagrangian_;
@@ -131,6 +136,10 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
         selectedRegionDatasetIds_[regionId] = datasetId;
         vtkmesh->Delete();
     }
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
+    }
 }
 
 
@@ -141,7 +150,7 @@ void Foam::vtkPV3Foam::convertMeshPatches
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshPatches" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshPatches" << endl;
     }
 
     const selectionInfo& selector = selectInfoPatches_;
@@ -196,6 +205,11 @@ void Foam::vtkPV3Foam::convertMeshPatches
             vtkmesh->Delete();
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshPatches" << endl;
+    }
 }
 
 
@@ -206,7 +220,7 @@ void Foam::vtkPV3Foam::convertMeshCellZones
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshCellZones" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
     }
 
     const selectionInfo& selector = selectInfoCellZones_;
@@ -263,6 +277,11 @@ void Foam::vtkPV3Foam::convertMeshCellZones
             vtkmesh->Delete();
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
+    }
 }
 
 
@@ -273,7 +292,7 @@ void Foam::vtkPV3Foam::convertMeshCellSet
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshCellSet" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
     }
 
     const selectionInfo& selector = selectInfoCellSets_;
@@ -337,6 +356,11 @@ void Foam::vtkPV3Foam::convertMeshCellSet
             vtkmesh->Delete();
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
+    }
 }
 
 void Foam::vtkPV3Foam::convertMeshFaceZones
@@ -346,7 +370,7 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
     }
 
     const selectionInfo& selector = selectInfoFaceZones_;
@@ -393,6 +417,11 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
             vtkmesh->Delete();
         }
     }
+    
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
+    }
 }
 
 
@@ -403,7 +432,7 @@ void Foam::vtkPV3Foam::convertMeshFaceSet
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshFaceSet" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshFaceSet" << endl;
     }
 
     const selectionInfo& selector = selectInfoFaceSets_;
@@ -458,6 +487,11 @@ void Foam::vtkPV3Foam::convertMeshFaceSet
             vtkmesh->Delete();
         }
     }
+    
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshFaceSet" << endl;
+    }
 }
 
 
@@ -468,7 +502,7 @@ void Foam::vtkPV3Foam::convertMeshPointZones
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshPointZones" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshPointZones" << endl;
     }
 
     const selectionInfo& selector = selectInfoPointZones_;
@@ -498,7 +532,7 @@ void Foam::vtkPV3Foam::convertMeshPointZones
             const label datasetId = GetNumberOfDataSets(output, selector);
 
             vtkPolyData* vtkmesh = vtkPolyData::New();
-            
+
             addPointZoneMesh
             (
                 mesh,
@@ -515,6 +549,11 @@ void Foam::vtkPV3Foam::convertMeshPointZones
             vtkmesh->Delete();
         }
     }
+    
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshPointZones" << endl;
+    }
 }
 
 
@@ -526,7 +565,7 @@ void Foam::vtkPV3Foam::convertMeshPointSet
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::convertMeshPointSet" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::convertMeshPointSet" << endl;
     }
 
     const selectionInfo& selector = selectInfoPointSets_;
@@ -581,7 +620,11 @@ void Foam::vtkPV3Foam::convertMeshPointSet
             vtkmesh->Delete();
         }
     }
+    
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::convertMeshPointSet" << endl;
+    }
 }
 
-
 // ************************************************************************* //

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H

@@ -66,7 +66,7 @@ void Foam::vtkPV3Foam::convertPointFields
 
                 if (debug)
                 {
-                    Info<< "converting Foam point field: " << fieldName
+                    Info<< "Foam::vtkPV3Foam::convertPointFields : " << fieldName
                         << endl;
                 }
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C

@@ -47,13 +47,16 @@ void Foam::vtkPV3Foam::updateFoamMesh()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateFoamMesh" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateFoamMesh" << endl;
     }
 
     if
     (
         !reader_->GetCacheMesh()
+#ifdef PV3FOAM_TIMESELECTION
+        // This is only useful if the times are individually selectable
      || reader_->GetTimeSelection()->GetArraySetting(0)
+#endif
     )
     {
         delete meshPtr_;
@@ -84,6 +87,11 @@ void Foam::vtkPV3Foam::updateFoamMesh()
             Info<< "Using existing Foam mesh" << endl;
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateFoamMesh" << endl;
+    }
 }
 
 
@@ -94,7 +102,7 @@ void Foam::vtkPV3Foam::updateVolFields
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateVolFields" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateVolFields" << endl;
     }
 
     const fvMesh& mesh = *meshPtr_;
@@ -155,6 +163,11 @@ void Foam::vtkPV3Foam::updateVolFields
     (
         mesh, pInterp, ppInterpList, objects, arraySelection, output
     );
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateVolFields" << endl;
+    }
 }
 
 
@@ -165,7 +178,7 @@ void Foam::vtkPV3Foam::updatePointFields
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updatePointFields" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updatePointFields" << endl;
     }
 
     const fvMesh& mesh = *meshPtr_;
@@ -175,11 +188,6 @@ void Foam::vtkPV3Foam::updatePointFields
 
     vtkDataArraySelection* arraySelection = reader_->GetPointFieldSelection();
 
-    // Convert point fields
-    if (debug)
-    {
-        Info<< "converting Foam point fields" << endl;
-    }
 /*
     convertPointFields<Foam::label>
     (
@@ -206,6 +214,11 @@ void Foam::vtkPV3Foam::updatePointFields
     (
         mesh, objects, arraySelection, output
     );
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updatePointFields" << endl;
+    }
 }
 
 
@@ -216,7 +229,7 @@ void Foam::vtkPV3Foam::updateLagrangianFields
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateLagrangianFields" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateLagrangianFields" << endl;
     }
 
     const fvMesh& mesh = *meshPtr_;
@@ -264,6 +277,11 @@ void Foam::vtkPV3Foam::updateLagrangianFields
     (
         mesh, objects, arraySelection, output
     );
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateLagrangianFields" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C

@@ -86,8 +86,7 @@ void Foam::vtkPV3Foam::updateInformationInternalMesh()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationInternalMesh"
-            << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationInternalMesh" << endl;
     }
 
     vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@@ -101,6 +100,12 @@ void Foam::vtkPV3Foam::updateInformationInternalMesh()
     selectInfoVolume_ = arraySelection->GetNumberOfArrays();
     arraySelection->AddArray("internalMesh");
     selectInfoVolume_ += 1;
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationInternalMesh" << endl;
+    }
+
 }
 
 
@@ -108,8 +113,8 @@ void Foam::vtkPV3Foam::updateInformationLagrangian()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationLagrangian "
-            << "at timePath " << dbPtr_->timePath()/"lagrangian" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationLagrangian" << nl
+            << "    " << dbPtr_->timePath()/"lagrangian" << endl;
     }
 
     vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@@ -144,11 +149,15 @@ void Foam::vtkPV3Foam::updateInformationLagrangian()
     {
         if (debug)
         {
-            Info<<"no clouds identified in "
-                << dbPtr_->timePath()/"lagrangian" << endl;
+            Info<<"no clouds identified in " <<nl
+                << "    " <<dbPtr_->timePath()/"lagrangian" << endl;
         }
     }
 
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationLagrangian" << endl;
+    }
 }
 
 
@@ -156,7 +165,7 @@ void Foam::vtkPV3Foam::updateInformationPatches()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationPatches" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationPatches" << endl;
     }
 
     vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@@ -198,6 +207,10 @@ void Foam::vtkPV3Foam::updateInformationPatches()
     }
     selectInfoPatches_ += nPatches;
 
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationPatches" << endl;
+    }
 }
 
 
@@ -205,7 +218,7 @@ void Foam::vtkPV3Foam::updateInformationZones()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationZones" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationZones" << endl;
     }
 
     vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@@ -301,6 +314,12 @@ void Foam::vtkPV3Foam::updateInformationZones()
             selectInfoPointZones_ += zones.size();
         }
     }
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationZones" << endl;
+    }
+
 }
 
 
@@ -308,7 +327,7 @@ void Foam::vtkPV3Foam::updateInformationSets()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationSets" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationSets" << endl;
     }
 
     vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@@ -346,6 +365,11 @@ void Foam::vtkPV3Foam::updateInformationSets()
         objects,
         " - pointSet"
     );
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationSets" << endl;
+    }
 }
 
 
@@ -353,7 +377,7 @@ void Foam::vtkPV3Foam::updateInformationLagrangianFields()
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationLagrangianFields"
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationLagrangianFields"
             << endl;
     }
 
@@ -415,8 +439,8 @@ void Foam::vtkPV3Foam::updateInformationLagrangianFields()
 
     if (debug)
     {
-        Info<< "lagrangian objects.size() = " << objects.size()
-            << endl;
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationLagrangianFields - "
+            << "lagrangian objects.size() = " << objects.size() << endl;
     }
 }
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H

@@ -40,7 +40,7 @@ void Foam::vtkPV3Foam::updateInformationFields
 {
     if (debug)
     {
-        Info<< "entered Foam::vtkPV3Foam::updateInformationFields" << endl;
+        Info<< "<beg> Foam::vtkPV3Foam::updateInformationFields" << endl;
     }
 
     // preserve the currently selected values
@@ -94,6 +94,11 @@ void Foam::vtkPV3Foam::updateInformationFields
         arraySelection,
         selectedEntries
     );
+
+    if (debug)
+    {
+        Info<< "<end> Foam::vtkPV3Foam::updateInformationFields" << endl;
+    }
 }
 
 

applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake

@@ -1 +1,2 @@
+#!/bin/sh
 wmake libso

applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C

@@ -26,10 +26,9 @@ Application
     libuserd-foam
 
 Description
-    Module for EnSight 7.6 to read FOAM data directly without translation
+    EnSight library module to read OpenFOAM data directly without translation
 
-    It can currently handle cells of type:
-    Z_HEX08, Z_PEN06, Z_TET04, Z_PUR05
+    It can currently handle most cell types.
 
     See also: README_USERD_2.0
     24 Sep 2001: NN - Added support for Ensight API 2.0

applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C

@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     instantList timeDirs = timeSelector::select0(runTime, args);
 #   include "createMesh.H"
 
-    IOprobes sniff(mesh, "probesDict", true);
+    IOprobes sniff(mesh, "probesDict", IOobject::MUST_READ, true);
 
     forAll(timeDirs, timeI)
     {