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

.gitignore

@@ -41,10 +41,6 @@ SunOS*Gcc*/
 # reinstate wmake/rules that might look like build folders
 !wmake/rules/*/
 
-# but do continue to ignore the derived wmake files
-wmake/rules/*/dirToString
-wmake/rules/*/wmkdep
-
 # doxygen generated documentation
 doc/[Dd]oxygen/html
 doc/[Dd]oxygen/latex

bin/buildParaView

@@ -58,8 +58,6 @@ withQTSUPPORT=true
 
 # Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
 QMAKE_PATH=""
-#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.5/bin/qmake
-#QMAKE_PATH=$WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/linux64GccDPOpt/bin/qmake
 
 #
 # No further editing below this line
@@ -87,7 +85,7 @@ For finer control, the build stages can be also selected individually
   -make
   -makedoc
   -install
-  [-envpath]    alter absolute paths in CMake files to use env variables
+  -envpath      alter absolute paths in CMake files to use env variables
 
 Build and install paraview-$ParaView_VERSION
   - run from folder above the ParaView source folder or place the ParaView
@@ -114,7 +112,7 @@ runCONFIG=true
 runMAKE=true
 runMAKEDOC=true
 runINSTALL=true
-runENVPATH=false
+runENVPATH=true
 
 
 # parse options
@@ -152,7 +150,7 @@ do
         runINSTALL=true
         shift
         ;;
-    -envpath)            # optional: change cmake files to use env variables
+    -envpath)            # stage 5: change cmake files to use env variables
         runCONFIG=false
         runMAKE=false
         runMAKEDOC=false
@@ -183,6 +181,11 @@ do
         withQTSUPPORT=true
         shift
         ;;
+    -qmake)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        export QMAKE_PATH=$2
+        shift 2
+        ;;
     -verbose)
         withVERBOSE=true
         shift

bin/foamPack

@@ -86,9 +86,10 @@ find -H $packDir               \
  -a ! -name "log[0-9]*"        \
  -a ! -name "so_locations"     \
 | sed                          \
- -e "\@$packDir/.git/@d"       \
  -e "\@$packDir/lib/@d"        \
+ -e '\@/\.git/@d'              \
  -e '\@applications/bin/@d'    \
+ -e '\@wmake/utilbin/@d'       \
  -e '\@/t/@d'                     \
  -e '\@Make[.A-Za-z]*/[^/]*/@d'   \
  -e '\@doc/[Dd]oxygen/html@d'     \
@@ -100,7 +101,7 @@ find -H $packDir               \
 
 tar czpf $packFile --files-from $tmpFile
 
-if [ $? = 0 ]
+if [ $? -eq 0 ]
 then
     echo "Finished packing and compressing $packDir into file $packFile"
 else

bin/foamPackBin

@@ -41,6 +41,9 @@ then
 fi
 arch=$1
 
+# base arch (w/o precision, optimization, etc)
+baseArch=$(echo "$arch" | sed -e 's@[DS]P.*$@@')
+
 timeStamp=$(date +%Y-%m-%d)
 packDir=$WM_PROJECT-$WM_PROJECT_VERSION
 packFile=${packDir}.${arch}_${timeStamp}.gtgz
@@ -73,6 +76,7 @@ dirList=$(
         $packDir/lib/$arch \
         $packDir/applications/bin/$arch \
         $packDir/wmake/rules \
+        $packDir/wmake/utilbin/$baseArch \
         ;
     do
         [ -d $dir ] && echo $dir
@@ -80,12 +84,12 @@ dirList=$(
 )
 
 echo
-echo "Packing $arch port of $packDir into $packFile"
+echo "Packing $arch ($baseArch) port of $packDir into $packFile"
 echo
 
 tar czpf $packFile $dirList
 
-if [ $? = 0 ]
+if [ $? -eq 0 ]
 then
     echo "Finished packing and compressing file $packFile"
 else

bin/foamPackDoxygen

@@ -112,7 +112,7 @@ else
     tar czpf $packFile $packDir/doc/Doxygen/html
 fi
 
-if [ $? = 0 ]
+if [ $? -eq 0 ]
 then
     echo "Finished packing doxygen html into file $packFile"
 else

bin/foamPackGeneral

@@ -62,7 +62,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 echo
-echo "Packing $packDir into $packFile"
+echo "Packing $packDir source files into $packFile"
 echo
 
 foamPackSource $packDir $packFile

bin/foamPackSource

@@ -78,19 +78,24 @@ find -H $packDir               \
  -a ! -name "log[0-9]*"        \
  -a ! -name "libccmio*"        \
 | sed                          \
- -e "\@$packDir/.git/@d"       \
- -e "\@/.tags/@d"              \
  -e "\@$packDir/lib/@d"        \
- -e "\@libccmio.*/@d"          \
+ -e '\@/\.git/@d'              \
+ -e '\@/\.tags/@d'             \
  -e '\@applications/bin/@d'    \
+ -e '\@wmake/utilbin/@d'       \
  -e '\@/t/@d'                  \
  -e '\@/Make[.A-Za-z]*/[^/]*/@d'\
  -e '\@/platforms/@d'          \
+ -e '\@libccmio.*/@d'          \
  > $tmpFile
 
+
+# provide some feedback
+wc $tmpFile | awk '{print "Packing",$1,"files - this could take some time ..."}'
+
 tar czpf $packFile --files-from $tmpFile
 
-if [ $? = 0 ]
+if [ $? -eq 0 ]
 then
     echo "Finished packing and compressing $packDir into file $packFile"
 else

bin/foamPackThirdPartyBin

@@ -31,7 +31,7 @@
 #
 #------------------------------------------------------------------------------
 
-if [ $# = 0 ]
+if [ $# -eq 0 ]
 then
     echo "Error: archOptions type expected, exiting"
     echo
@@ -41,16 +41,23 @@ then
 fi
 archOptions=$1
 arch=${archOptions%%G*}  # TODO: works for Gcc only
-arch3264=$(echo "$arch" | sed 's@64@-64@')
+arch3264=$(echo "$arch" | sed -e 's@64@-64@')
 
 echo "archOptions=$archOptions"
 echo "arch=$arch"
 echo "arch3264=$arch3264"
 
 timeStamp=$(date +%Y-%m-%d)
-packDir=ThirdParty
+packDir=${WM_THIRD_PARTY_DIR:-ThirdParty}
+packDir=${packDir##*/}
 packFile=${packDir}.${archOptions}_${timeStamp}.gtgz
 
+if [ ! -d $packDir ]
+then
+    echo "Error: directory $packDir does not exist"
+    exit 1
+fi
+
 # add optional output directory
 if [ -d "$2" ]
 then
@@ -71,7 +78,7 @@ echo
 
 tar czpf $packFile $dirList
 
-if [ $? = 0 ]
+if [ $? -eq 0 ]
 then
     echo "Finished packing and compressing file $packFile"
 else

bin/foamPackThirdPartyGeneral

@@ -32,7 +32,8 @@
 #------------------------------------------------------------------------------
 
 timeStamp=$(date +%Y-%m-%d)
-packDir=ThirdParty
+packDir=${WM_THIRD_PARTY_DIR:-ThirdParty}
+packDir=${packDir##*/}
 packFile=${packDir}.General_${timeStamp}.gtgz
 
 if [ ! -d $packDir ]
@@ -62,7 +63,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 echo
-echo "Packing $packDir into $packFile"
+echo "Packing $packDir source files into $packFile"
 echo
 
 foamPackSource $packDir $packFile

bin/tools/buildParaViewFunctions

@@ -171,10 +171,13 @@ addQtSupport()
 
     addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
 
+    qmakeExe=qmake
+
     if [ -n "$QMAKE_PATH" ]
     then
         if [ -x "$QMAKE_PATH" ]
         then
+            qmakeExe=$QMAKE_PATH
             addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
         else
             echo
@@ -184,6 +187,28 @@ addQtSupport()
             echo
         fi
     fi
+
+    # Check qmake can be found
+    if [ `which $qmakeExe` ]
+    then
+        # Check the Qt version selected
+        QtVersion=`$qmakeExe -v | grep Using | sed "s/.* version \(.\..\).*/\1/"`
+        QtMajor=`echo $QtVersion | sed "s/\(.\)\../\1/"`
+        QtMinor=`echo $QtVersion | sed "s/.\.\(.\)/\1/"`
+
+        if [ $QtMajor -lt 4 -o $QtMinor -lt 3 ]
+        then
+            echo "*** Error: Qt version provided < 4.3"
+            echo "***     Please use the -qmake option to specify the location of a version of Qt >= 4.3 "
+            echo "***     e.g."
+            echo "***         -qmake /usr/local/Trolltech/Qt-4.3.5/bin/qmake"
+            echo "***         -qmake $WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/$WM_OPTIONS/bin/qmake"
+            exit 1
+        fi
+    else
+        echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH"
+        exit 1
+    fi
 }
 
 

src/thermophysicalModels/basic/rhoThermo/.directory

@@ -1,5 +0,0 @@
-[Dolphin]
-AdditionalInfo=3
-SortOrder=0
-Timestamp=2009,6,10,15,58,20
-ViewMode=1

src/turbulenceModels/compressible/LES/LESModel/LESModel.H

@@ -33,13 +33,13 @@ Class
     Foam::compressible::LESModel
 
 Description
-    Class for all compressible flow LES SGS models.
+    Base class for all compressible flow LES SGS models.
 
-    This class defines the basic interface for a compressible flow SGS model,
+    This class defines the basic interface for a compressible flow SGS
-    and encapsulates data of value to all possible models. In particular
+    model, and encapsulates data of value to all possible models.
-    this includes references to all the dependent fields (rho, U, phi),
+    In particular this includes references to all the dependent fields
-    the physical viscosity mu, and the LESProperties dictionary,
+    (rho, U, phi), the physical viscosity mu, and the LESProperties
-    which contains the model selection and model coefficients.
+    dictionary, which contains the model selection and model coefficients.
 
 SourceFiles
     LESModel.C

src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C

@@ -51,8 +51,8 @@ void kQRWallFunctionFvPatchField<Type>::checkType()
             << "Invalid wall function specification" << nl
             << "    Patch type for patch " << this->patch().name()
             << " must be wall" << nl
-            << "    Current patch type is " << this->patch().type()
+            << "    Current patch type is " << this->patch().type() << nl << endl
-            << nl << endl << abort(FatalError);
+            << abort(FatalError);
     }
 }
 

src/turbulenceModels/compressible/RAS/laminar/laminar.H

@@ -30,12 +30,11 @@ Description
 
 SourceFiles
     laminar.C
-    laminarCorrect.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleLaminar_H
+#ifndef compressibleRasLaminar_H
-#define compressibleLaminar_H
+#define compressibleRasLaminar_H
 
 #include "RASModel.H"
 
@@ -82,42 +81,42 @@ public:
     // Member Functions
 
         //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        tmp<volScalarField> mut() const;
+        virtual tmp<volScalarField> mut() const;
 
         //- Return the effective viscosity, i.e. the laminar viscosity
-        tmp<volScalarField> muEff() const
+        virtual tmp<volScalarField> muEff() const
         {
             return tmp<volScalarField>(new volScalarField("muEff", mu()));
         }
 
         //- Return the effective turbulent thermal diffusivity,
         //  i.e. the laminar thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
         }
 
         //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the turbulence kinetic energy dissipation rate,
         //  i.e. 0 for laminar flow
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor, i.e. the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Correct the laminar viscosity
-        void correct();
+        virtual void correct();
 
         //- Read RASProperties dictionary
-        bool read();
+        virtual bool read();
 };
 
 

src/turbulenceModels/compressible/turbulenceModel/Make/options

@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \

src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C

@@ -52,10 +52,10 @@ laminar::laminar
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    const basicThermo& thermoPhysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
-    turbulenceModel(rho, U, phi, thermoPhysicalModel)
+    turbulenceModel(rho, U, phi, thermophysicalModel)
 {}
 
 
@@ -66,10 +66,10 @@ autoPtr<laminar> laminar::New
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    const basicThermo& thermoPhysicalModel
+    const basicThermo& thermophysicalModel
 )
 {
-    return autoPtr<laminar>(new laminar(rho, U, phi, thermoPhysicalModel));
+    return autoPtr<laminar>(new laminar(rho, U, phi, thermophysicalModel));
 }
 
 
@@ -96,18 +96,6 @@ tmp<volScalarField> laminar::mut() const
 }
 
 
-tmp<volScalarField> laminar::muEff() const
-{
-    return tmp<volScalarField>(new volScalarField("muEff", mu()));
-}
-
-
-tmp<volScalarField> laminar::alphaEff() const
-{
-    return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
-}
-
-
 tmp<volScalarField> laminar::k() const
 {
     return tmp<volScalarField>

src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H

@@ -33,8 +33,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
+#ifndef compressibleLaminar_H
-#define laminar_H
+#define compressibleLaminar_H
 
 #include "turbulenceModel.H"
 
@@ -67,7 +67,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const basicThermo& thermoPhysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
@@ -79,7 +79,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            const basicThermo& thermoPhysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
@@ -94,10 +94,17 @@ public:
         virtual tmp<volScalarField> mut() const;
 
         //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> muEff() const;
+        virtual tmp<volScalarField> muEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("muEff", mu()));
+        }
 
-        //- Return the effective turbulent thermal diffusivity
+        //- Return the effective turbulent thermal diffusivity,
-        virtual tmp<volScalarField> alphaEff() const;
+        //  i.e. the laminar thermal diffusivity
+        virtual tmp<volScalarField> alphaEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
+        }
 
         //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
         virtual tmp<volScalarField> k() const;
@@ -109,7 +116,7 @@ public:
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor including the laminar stress
+        //- Return the effective stress tensor, i.e. the laminar stress
         virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation

src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C

@@ -117,12 +117,6 @@ autoPtr<turbulenceModel> turbulenceModel::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-turbulenceModel::~turbulenceModel()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void turbulenceModel::correct()

src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H

@@ -144,7 +144,8 @@ public:
 
 
     //- Destructor
-    virtual ~turbulenceModel();
+    virtual ~turbulenceModel()
+    {}
 
 
     // Member Functions

src/turbulenceModels/incompressible/LES/LESModel/LESModel.C

@@ -124,8 +124,8 @@ autoPtr<LESModel> LESModel::New
     {
         FatalErrorIn
         (
-            "LESModel::select(const volVectorField&, const "
+            "LESModel::New(const volVectorField& U, const "
-            "surfaceScalarField&, transportModel&)"
+            "surfaceScalarField& phi, transportModel&)"
         )   << "Unknown LESModel type " << modelName
             << endl << endl
             << "Valid LESModel types are :" << endl
@@ -137,12 +137,6 @@ autoPtr<LESModel> LESModel::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-LESModel::~LESModel()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void LESModel::correct(const tmp<volTensorField>&)

src/turbulenceModels/incompressible/LES/LESModel/LESModel.H

@@ -35,10 +35,10 @@ Description
     Base class for all incompressible flow LES SGS models.
 
     This class defines the basic interface for an incompressible flow SGS
-    model, and encapsulates data of value to all possible models. In
+    model, and encapsulates data of value to all possible models.
-    particular this includes references to all the dependent fields (U,
+    In particular this includes references to all the dependent fields
-    phi), the physical viscosity nu, and the LESProperties
+    (U, phi), the physical viscosity nu, and the LESProperties
-    dictionary which contains the model selection and model coefficients.
+    dictionary, which contains the model selection and model coefficients.
 
 SourceFiles
     LESModel.C
@@ -151,7 +151,8 @@ public:
 
 
     //- Destructor
-    virtual ~LESModel();
+    virtual ~LESModel()
+    {}
 
 
     // Member Functions
@@ -240,14 +241,14 @@ public:
             }
 
 
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
-
         //- Correct Eddy-Viscosity and related properties.
         //  This calls correct(const tmp<volTensorField>& gradU) by supplying
         //  gradU calculated locally.
         void correct();
 
+        //- Correct Eddy-Viscosity and related properties
+        virtual void correct(const tmp<volTensorField>& gradU);
+
         //- Read LESProperties dictionary
         virtual bool read() = 0;
 };

src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C

@@ -133,12 +133,6 @@ dynOneEqEddy::dynOneEqEddy
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-dynOneEqEddy::~dynOneEqEddy()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)

src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H

@@ -116,7 +116,8 @@ public:
 
 
     //- Destructor
-    virtual ~dynOneEqEddy();
+    virtual ~dynOneEqEddy()
+    {}
 
 
     // Member Functions

src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C

@@ -124,12 +124,6 @@ dynSmagorinsky::dynSmagorinsky
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-dynSmagorinsky::~dynSmagorinsky()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void dynSmagorinsky::correct(const tmp<volTensorField>& gradU)

src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H

@@ -125,7 +125,8 @@ public:
 
 
     //- Destructor
-    virtual ~dynSmagorinsky();
+    virtual ~dynSmagorinsky()
+    {}
 
 
     // Member Functions

src/turbulenceModels/incompressible/LES/laminar/laminar.H

@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
+#ifndef lesLaminar_H
-#define laminar_H
+#define lesLaminar_H
 
 #include "LESModel.H"
 #include "volFields.H"

src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C

@@ -126,12 +126,6 @@ locDynOneEqEddy::locDynOneEqEddy
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-locDynOneEqEddy::~locDynOneEqEddy()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)

src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H

@@ -138,7 +138,8 @@ public:
 
 
     //- Destructor
-    virtual ~locDynOneEqEddy();
+    virtual ~locDynOneEqEddy()
+    {}
 
 
     // Member Functions

src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C

@@ -56,12 +56,6 @@ scaleSimilarity::scaleSimilarity
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-scaleSimilarity::~scaleSimilarity()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 tmp<volScalarField> scaleSimilarity::k() const

src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H

@@ -90,7 +90,8 @@ public:
 
 
     //- Destructor
-    virtual ~scaleSimilarity();
+    virtual ~scaleSimilarity()
+    {}
 
 
     // Member Functions

src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C

@@ -174,14 +174,9 @@ autoPtr<RASModel> RASModel::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-RASModel::~RASModel()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+
 scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
 {
     scalar ypl = 11.0;

src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H

@@ -182,7 +182,8 @@ public:
 
 
     //- Destructor
-    virtual ~RASModel();
+    virtual ~RASModel()
+    {}
 
 
     // Member Functions
@@ -310,9 +311,6 @@ public:
             );
         }
 
-        //- Return yPlus for the given patch
-        virtual tmp<scalarField> yPlus(const label patchI) const;
-
         //- Return the turbulence kinetic energy
         virtual tmp<volScalarField> k() const = 0;
 
@@ -328,6 +326,9 @@ public:
         //- Return the source term for the momentum equation
         virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
 
+        //- Return yPlus for the given patch
+        virtual tmp<scalarField> yPlus(const label patchI) const;
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 

src/turbulenceModels/incompressible/RAS/laminar/laminar.C

@@ -77,12 +77,6 @@ tmp<volScalarField> laminar::nut() const
 }
 
 
-tmp<volScalarField> laminar::nuEff() const
-{
-    return tmp<volScalarField>(new volScalarField("nuEff", nu()));
-}
-
-
 tmp<volScalarField> laminar::k() const
 {
     return tmp<volScalarField>

src/turbulenceModels/incompressible/RAS/laminar/laminar.H

@@ -33,8 +33,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
+#ifndef rasLaminar_H
-#define laminar_H
+#define rasLaminar_H
 
 #include "RASModel.H"
 
@@ -83,7 +83,10 @@ public:
         virtual tmp<volScalarField> nut() const;
 
         //- Return the effective viscosity, i.e. the laminar viscosity
-        virtual tmp<volScalarField> nuEff() const;
+        virtual tmp<volScalarField> nuEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("nuEff", nu()));
+        }
 
         //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
         virtual tmp<volScalarField> k() const;
@@ -95,7 +98,7 @@ public:
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor including the laminar stress
+        //- Return the effective stress tensor, i.e. the laminar stress
         virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation

src/turbulenceModels/incompressible/turbulenceModel/Make/options

@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/transportModels
 
 LIB_LIBS = \

src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H

@@ -104,7 +104,7 @@ public:
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
         virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor including the laminar stress
+        //- Return the effective stress tensor, i.e. the laminar stress
         virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation

src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C

@@ -110,12 +110,6 @@ autoPtr<turbulenceModel> turbulenceModel::New
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-turbulenceModel::~turbulenceModel()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void turbulenceModel::correct()

src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H

@@ -139,7 +139,8 @@ public:
 
 
     //- Destructor
-    virtual ~turbulenceModel();
+    virtual ~turbulenceModel()
+    {}
 
 
     // Member Functions

tutorials/combustion/XiFoam/les/pitzDaily/0/T

@@ -42,7 +42,7 @@ boundaryField
     lowerWall
     {
         type            fixedValue;
-        value           uniform 293;
+        value           uniform 570;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily/0/Tu

@@ -42,7 +42,7 @@ boundaryField
     lowerWall
     {
         type            fixedValue;
-        value           uniform 293;
+        value           uniform 570;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs

@@ -32,15 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            zeroGradient;
+        type            compressible::alphaSgsJayatillekeWallFunction;
-        //type            compressible::alphaSgsWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            compressible::alphaSgsJayatillekeWallFunction;
-        //type            compressible::alphaSgsWallFunction;
         value           uniform 0;
     }
 

tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs

@@ -32,15 +32,13 @@ boundaryField
 
     upperWall
     {
-        type            zeroGradient;
+        type            compressible::muSgsWallFunction;
-        //type            compressible::muSgsWallFunction;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            compressible::muSgsWallFunction;
-        //type            compressible::muSgsWallFunction;
         value           uniform 0;
     }
 

tutorials/combustion/XiFoam/les/pitzDaily/0/p

@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 1e5;
 
 boundaryField
 {
@@ -27,8 +27,15 @@ boundaryField
 
     outlet
     {
-        type            fixedValue;
+        type            waveTransmissive;
-        value           uniform 100000;
+        field           p;
+        phi             phi;
+        rho             rho;
+        psi             psi;
+        gamma           1.3;
+        fieldInf        1e5;
+        lInf            0.3;
+        value           uniform 1e5;
     }
 
     upperWall

tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties

@@ -19,6 +19,8 @@ LESModel        oneEqEddy;
 
 delta           cubeRootVol;
 
+turbulence      on;
+
 printCoeffs     on;
 
 laminarCoeffs
@@ -123,6 +125,7 @@ kappa           0.4187;
 wallFunctionCoeffs
 {
     E               9;
+    Prt             0.85;
 }
 
 

tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties

@@ -21,7 +21,7 @@ fuel            Propane;
 
 Su              Su [0 1 -1 0 0 0 0] 0.135;
 
-SuModel         unstrained;
+SuModel         transport;
 
 equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
 
@@ -76,8 +76,8 @@ ignitionSites
         location (0.005 -0.02 0);
         diameter 0.003;
         start 0;
-        duration 0.1;
+        duration 0.05;
-        strength 40;
+        strength 20;
     }
 );
 

tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict

@@ -18,50 +18,50 @@ convertToMeters 0.001;
 
 vertices
 (
-    (-20.6 0 -0.5)
+    (-20.6 0 0)
-    (-20.6 3 -0.5)
+    (-20.6 3 0)
-    (-20.6 12.7 -0.5)
+    (-20.6 12.7 0)
-    (-20.6 25.4 -0.5)
+    (-20.6 25.4 0)
-    (0 -25.4 -0.5)
+    (0 -25.4 0)
-    (0 -5 -0.5)
+    (0 -5 0)
-    (0 0 -0.5)
+    (0 0 0)
-    (0 3 -0.5)
+    (0 3 0)
-    (0 12.7 -0.5)
+    (0 12.7 0)
-    (0 25.4 -0.5)
+    (0 25.4 0)
-    (206 -25.4 -0.5)
+    (206 -25.4 0)
-    (206 -8.5 -0.5)
+    (206 -8.5 0)
-    (206 0 -0.5)
+    (206 0 0)
-    (206 6.5 -0.5)
+    (206 6.5 0)
-    (206 17 -0.5)
+    (206 17 0)
-    (206 25.4 -0.5)
+    (206 25.4 0)
-    (290 -16.6 -0.5)
+    (290 -16.6 0)
-    (290 -6.3 -0.5)
+    (290 -6.3 0)
-    (290 0 -0.5)
+    (290 0 0)
-    (290 4.5 -0.5)
+    (290 4.5 0)
-    (290 11 -0.5)
+    (290 11 0)
-    (290 16.6 -0.5)
+    (290 16.6 0)
-    (-20.6 0 0.5)
+    (-20.6 0 38.1)
-    (-20.6 3 0.5)
+    (-20.6 3 38.1)
-    (-20.6 12.7 0.5)
+    (-20.6 12.7 38.1)
-    (-20.6 25.4 0.5)
+    (-20.6 25.4 38.1)
-    (0 -25.4 0.5)
+    (0 -25.4 38.1)
-    (0 -5 0.5)
+    (0 -5 38.1)
-    (0 0 0.5)
+    (0 0 38.1)
-    (0 3 0.5)
+    (0 3 38.1)
-    (0 12.7 0.5)
+    (0 12.7 38.1)
-    (0 25.4 0.5)
+    (0 25.4 38.1)
-    (206 -25.4 0.5)
+    (206 -25.4 38.1)
-    (206 -8.5 0.5)
+    (206 -8.5 38.1)
-    (206 0 0.5)
+    (206 0 38.1)
-    (206 6.5 0.5)
+    (206 6.5 38.1)
-    (206 17 0.5)
+    (206 17 38.1)
-    (206 25.4 0.5)
+    (206 25.4 38.1)
-    (290 -16.6 0.5)
+    (290 -16.6 38.1)
-    (290 -6.3 0.5)
+    (290 -6.3 38.1)
-    (290 0 0.5)
+    (290 0 38.1)
-    (290 4.5 0.5)
+    (290 4.5 38.1)
-    (290 11 0.5)
+    (290 11 38.1)
-    (290 16.6 0.5)
+    (290 16.6 38.1)
 );
 
 blocks

tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties

@@ -15,19 +15,44 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType
+    hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
+stoichiometricAirFuelMassRatio
+    stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
 
-fuel            fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
+// phi = 0.57
+// ft = 0.0352993
+// Tad = 1650.1
 
-oxidant         oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672;
+fuel fuel       1       44.0962
+    100 5000    1000
+    7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923
+    0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017
+    1.67212e-06 170.672;
 
-reactants       reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672;
+oxidant oxidant 1       28.8504
+    100 6000    1000
+    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
+    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
+    1.67212e-06 170.672;
 
-products        products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+reactants reactants     1       29.2068
+    100 5000    1000
+    3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241
+    3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856
+    1.67212e-06 170.672;
 
-burntProducts   burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+burntProducts burntProducts     1       28.3233
+    100 6000    1000
+    3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104
+    3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188
+    1.67212e-06 170.672;
 
+products products       1       28.5396
+    100 5000    1000
+    3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744
+    3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336
+    1.67212e-06 170.672;
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict

@@ -23,7 +23,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         10;
+endTime         0.5;
 
 deltaT          5e-06;
 

tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes

@@ -17,34 +17,29 @@ FoamFile
 
 ddtSchemes
 {
-    default         Euler;
+    default         backward;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss limitedLinearV 1;
+    div(phi,U)      Gauss linear;
-    div(phid,p)     Gauss linear;
     div(phiU,p)     Gauss linear;
-    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 0.1;
-    div(phi,B)      Gauss limitedLinear 1;
+    div(phiXi,Xi)   Gauss limitedLinear01 0.1;
-    div(B)          Gauss linear;
+    div(phiXi,Su)   Gauss limitedLinear01 0.1;
-    div(phiXi,Xi)   Gauss limitedLinear 1;
+    div(phiSt,b)    Gauss limitedLinear01 0.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 0.1;
-        ft limitedLinear01 1;
+        b limitedLinear01 0.1;
-        b limitedLinear01 1;
+        h limitedLinear 0.1;
-        h limitedLinear 1;
+        hu limitedLinear 0.1;
-        hu limitedLinear 1;
     };
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;

tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution

@@ -124,8 +124,8 @@ solvers
 
 PISO
 {
-    nOuterCorrectors 1;
+    nOuterCorrectors 2;
-    nCorrectors     2;
+    nCorrectors     1;
     nNonOrthogonalCorrectors 0;
 }
 

tutorials/combustion/XiFoam/les/pitzDaily3D/0/B

@@ -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            cyclic;
-    }
-}
-
-// ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/0/T

@@ -42,7 +42,7 @@ boundaryField
     lowerWall
     {
         type            fixedValue;
-        value           uniform 293;
+        value           uniform 570;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu

@@ -42,7 +42,7 @@ boundaryField
     lowerWall
     {
         type            fixedValue;
-        value           uniform 293;
+        value           uniform 570;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs

@@ -32,12 +32,14 @@ boundaryField
 
     upperWall
     {
-        type            zeroGradient;
+        type            compressible::alphaSgsJayatillekeWallFunction;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            compressible::alphaSgsJayatillekeWallFunction;
+        value           uniform 0;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft

@@ -1,52 +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       volScalarField;
-    object      ft;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet           
-    {
-        type            fixedValue;
-        value           uniform 0;
-    }
-
-    outlet          
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-
-    upperWall       
-    {
-        type            zeroGradient;
-    }
-
-    lowerWall       
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack    
-    {
-        type            cyclic;
-    }
-}
-
-// ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/0/k

@@ -35,14 +35,14 @@ boundaryField
 
     upperWall
     {
-        type            fixedValue;
+        type            zeroGradient;
-        value           uniform 1e-8;
+        value           uniform 2e-05;
     }
 
     lowerWall
     {
-        type            fixedValue;
+        type            zeroGradient;
-        value           uniform 1e-8;
+        value           uniform 2e-05;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs

@@ -32,12 +32,14 @@ boundaryField
 
     upperWall
     {
-        type            zeroGradient;
+        type            compressible::muSgsWallFunction;
+        value           uniform 0;
     }
 
     lowerWall
     {
-        type            zeroGradient;
+        type            compressible::muSgsWallFunction;
+        value           uniform 0;
     }
 
     frontAndBack

tutorials/combustion/XiFoam/les/pitzDaily3D/0/p

@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [1 -1 -2 0 0 0 0];
 
-internalField   uniform 100000;
+internalField   uniform 1e5;
 
 boundaryField
 {
@@ -27,8 +27,15 @@ boundaryField
 
     outlet
     {
-        type            fixedValue;
+        type            waveTransmissive;
-        value           uniform 100000;
+        field           p;
+        phi             phi;
+        rho             rho;
+        psi             psi;
+        gamma           1.3;
+        fieldInf        1e5;
+        lInf            0.3;
+        value           uniform 1e5;
     }
 
     upperWall

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.5                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -19,6 +19,8 @@ LESModel        oneEqEddy;
 
 delta           cubeRootVol;
 
+turbulence      on;
+
 printCoeffs     on;
 
 laminarCoeffs
@@ -123,6 +125,7 @@ kappa           0.4187;
 wallFunctionCoeffs
 {
     E               9;
+    Prt             0.85;
 }
 
 

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties

@@ -73,11 +73,11 @@ ignite          yes;
 ignitionSites
 (
     {
-        location (0 0 0);
+        location (0.005 -0.02 0.01905);
         diameter 0.003;
         start 0;
-        duration 0.001;
+        duration 0.1;
-        strength 2;
+        strength 200;
     }
 );
 

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.5                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.5                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -15,19 +15,44 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+thermoType
+    hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
 
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
+stoichiometricAirFuelMassRatio
+    stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675;
 
-fuel            fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672;
+// phi = 0.57
+// ft = 0.0352993
+// Tad = 1650.1
 
-oxidant         oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672;
+fuel fuel       1       44.0962
+    100 5000    1000
+    7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923
+    0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017
+    1.67212e-06 170.672;
 
-reactants       reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672;
+oxidant oxidant 1       28.8504
+    100 6000    1000
+    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
+    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
+    1.67212e-06 170.672;
 
-products        products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+reactants reactants     1       29.2068
+    100 5000    1000
+    3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241
+    3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856
+    1.67212e-06 170.672;
 
-burntProducts   burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672;
+burntProducts burntProducts     1       28.3233
+    100 6000    1000
+    3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104
+    3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188
+    1.67212e-06 170.672;
 
+products products       1       28.5396
+    100 5000    1000
+    3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744
+    3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336
+    1.67212e-06 170.672;
 
 // ************************************************************************* //

tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict

@@ -17,13 +17,13 @@ FoamFile
 
 application     XiFoam;
 
-startFrom       startTime;
+startFrom       latestTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         0.02;
+endTime         0.5;
 
 deltaT          5e-06;
 

tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.5                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -17,28 +17,30 @@ FoamFile
 
 ddtSchemes
 {
-    default         Euler;
+    default         backward;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
 {
     default         none;
-    div(phi,U)      Gauss limitedLinearV 1;
+    div(phi,U)      Gauss linear;
-    div(phid,p)     Gauss linear;
     div(phiU,p)     Gauss linear;
-    div(phi,k)      Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 0.1;
-    div(phi,B)      Gauss limitedLinear 1;
+    div(phiXi,Xi)   Gauss limitedLinear01 0.1;
-    div(B)          Gauss linear;
+    div(phiXi,Su)   Gauss limitedLinear01 0.1;
-    div(phiXi,Xi)   Gauss limitedLinear 1;
+    div(phiSt,b)    Gauss limitedLinear01 0.1;
-    div(phiXi,Su)   Gauss limitedLinear 1;
+    div(phi,ft_b_h_hu) Gauss multivariateSelection
-    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 ; };
+        ft limitedLinear01 0.1;
+        b limitedLinear01 0.1;
+        h limitedLinear 0.1;
+        hu limitedLinear 0.1;
+    };
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
     div((U+((Su*Xi)*grad(b)))) Gauss linear;
@@ -52,8 +54,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(alphaEff,b) Gauss linear corrected;
-    laplacian(muEff,ft) Gauss linear corrected;
+    laplacian(alphaEff,ft) Gauss linear corrected;
     laplacian(alphaEff,h) Gauss linear corrected;
     laplacian(alphaEff,hu) Gauss linear corrected;
 }

tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
+|  \\    /   O peration     | Version:  1.5                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -124,7 +124,8 @@ solvers
 
 PISO
 {
-    nCorrectors     2;
+    nOuterCorrectors 2;
+    nCorrectors     1;
     nNonOrthogonalCorrectors 0;
 }
 

tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties

@@ -17,6 +17,8 @@ FoamFile
 
 LESModel        oneEqEddy;
 
+turbulence      on;
+
 printCoeffs     on;
 
 delta           cubeRootVol;

wmake/rules/solarisGcc/mplibPVM

@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(PVM_ROOT)/include
-PLIBS      = -L$(PVM_ROOT)/lib/$(PVM_ARCH) -lgpvm3 -lpvm3s