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

.gitignore

@@ -8,7 +8,7 @@
 *.bak
 
 # CVS recovered versions - anywhere
-.#*
+*\#*\#
 
 # objects and archives - anywhere
 *.[oa]

applications/solvers/compressible/sonicLiquidFoam/createFields.H

@@ -37,8 +37,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        rho0 + psi*(p - p0),
-        p.boundaryField().types()
+        rhoO + psi*p
     );
 
 

applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C

@@ -85,6 +85,9 @@ int main(int argc, char *argv[])
                     << exit(FatalError);
             }
 
+            // Give patch area
+            Info<< "    Patch area = " << sum(mesh.Sf()) << endl;
+
             if (fieldHeader.headerClassName() == "volScalarField")
             {
                 Info<< "    Reading volScalarField " << fieldName << endl;

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C

@@ -29,6 +29,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "SRFModel.H"
+#include "SRFVelocityFvPatchVectorField.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -190,4 +191,54 @@ Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::U() const
 }
 
 
+Foam::tmp<Foam::volVectorField> Foam::SRF::SRFModel::Uabs() const
+{
+    const volVectorField Usrf = U();
+
+    tmp<volVectorField> tUabs
+    (
+        new volVectorField
+        (
+            IOobject
+            (
+                "Uabs",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            Usrf
+        )
+    );
+
+    // Add SRF contribution to internal field
+    tUabs().internalField() += Urel_.internalField();
+
+    // Add Urel boundary contributions
+    const volVectorField::GeometricBoundaryField& bvf = Urel_.boundaryField();
+
+    forAll(bvf, i)
+    {
+        if (isA<SRFVelocityFvPatchVectorField>(bvf[i]))
+        {
+            // Only include relative contributions from
+            // SRFVelocityFvPatchVectorField's
+            const SRFVelocityFvPatchVectorField& UrelPatch =
+                refCast<const SRFVelocityFvPatchVectorField>(bvf[i]);
+            if (UrelPatch.relative())
+            {
+                tUabs().boundaryField()[i] += Urel_.boundaryField()[i];
+            }
+        }
+        else
+        {
+            tUabs().boundaryField()[i] += Urel_.boundaryField()[i];
+        }
+    }
+
+    return tUabs;
+}
+
+
 // ************************************************************************* //

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H

@@ -171,6 +171,9 @@ public:
 
             //- Return velocity of SRF for complete mesh
             tmp<volVectorField> U() const;
+
+            //- Return absolute velocity for complete mesh
+            tmp<volVectorField> Uabs() const;
 };
 
 

src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.H

@@ -132,6 +132,15 @@ public:
 
     // Member functions
 
+        // Access
+
+            //- Return const access to the relative flag
+            const Switch& relative() const
+            {
+                return relative_;
+            }
+
+
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object

wmake/wmakeLockScheduler

@@ -0,0 +1,201 @@
+#!/bin/bash
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     wmakeScheduler
+#
+# Description
+#     Scheduler for network distributed compilations using wmake.
+#     - WM_HOSTS contains a list of hosts and number of concurrent processes
+#     eg,
+#        export WM_HOSTS="hostA:1 hostB:2 hostC:1"
+#     - WM_COLOURS contains a list of colours to cycle through
+#        export WM_COLOURS="black blue green cyan red magenta yellow"
+#
+#     Sources the relevant cshrc/bashrc if not set.
+#
+#     WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
+#     before calling this routine
+#
+# Usage
+#     wmakeScheduler COMMAND
+#         run 'COMMAND' on one of the slots listed in WM_HOSTS
+#
+#     wmakeScheduler -count
+#         count the total number of slots available in WM_HOSTS
+#         eg,  WM_NCOMPPROCS=$(wmakeScheduler -count)
+#
+#-------------------------------------------------------------------------------
+lockDir=$HOME/.wmakeScheduler
+
+# fallback - 1 core on current host
+: ${WM_HOSTS:=$HOST:1}
+
+# count the total number of slots available and exit
+if [ "$1" = "-count" ]
+then
+    expr $(
+        for slotGroup in $WM_HOSTS
+        do
+            n=${slotGroup##*:}
+            if [ "$n" = "${slotGroup%%:*}" ]; then n=1; fi # missing ':'
+            echo "+ ${n:-1}"
+        done)
+    exit 0
+fi
+
+# where to source WM_PROJECT settings in a remote shell
+# This code tries to figure out which cshrc or bashrc to execute.
+# !! Assumes remote computer running same shell and startup files
+# in same location
+
+sourceFoam=false    # fallback command
+case $SHELL in
+*/csh | */tcsh )    # [t]csh vs bash|ksh|sh
+    shellRc=cshrc
+    ;;
+*)
+    shellRc=bashrc
+    ;;
+esac
+
+# check ~/.$WM_PROJECT-$WM_PROJECT_VERSION/
+# check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
+# check ~/.$WM_PROJECT/
+# check <installedProject>/etc/
+# check <installedProject/.$WM_PROJECT-$WM_PROJECT_VERSION/
+if [ "$WM_PROJECT" ]; then
+
+    : ${FOAM_DOT_DIR:=.$WM_PROJECT-$WM_PROJECT_VERSION}
+
+    for i in \
+        $HOME/$FOAM_DOT_DIR \
+        $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
+        $HOME/.$WM_PROJECT \
+        $WM_PROJECT_DIR/etc \
+        $WM_PROJECT_DIR/$FOAM_DOT_DIR \
+        ;
+    do
+        if [ -f "$i/$shellRc" ]; then
+            sourceFoam="$i/$shellRc"
+            break
+        fi
+    done
+fi
+
+# Construct test string for remote execution.
+# Source WM_PROJECT settings if WM_PROJECT environment not set.
+case $sourceFoam in
+    */cshrc)  sourceFoam='if ( ! $?WM_PROJECT ) source '"$sourceFoam";;
+    */bashrc) sourceFoam='[ "$WM_PROJECT" ] || . '"$sourceFoam";;
+esac
+
+# quote double-quotes for remote command line
+rcmd=$(echo $* | sed -e s/\"/\'\"\'/g)
+## the same, without forking (not ksh, maybe not /bin/sh either)
+# rcmd=$(while [ "$#" -gt 0 ]; do echo "${1//\"/'\"'}"; shift; done)
+
+
+# Convert WM_COLOURS into an array
+declare colours
+nColours=0
+for col in $WM_COLOURS
+do
+    colours[$nColours]=$col
+    ((nColours = $nColours + 1))
+done
+
+# Bashism: make pipe fail early. This make sure return value of compilation
+# is returned and not of colouring pipe.
+set -o pipefail
+
+# Define function to colour output by argument 1
+colourPipe(){
+    if [ "$1" ]; then
+        (while read line; do setterm -foreground $1; echo "$line" ; done; setterm -foreground default)
+    else
+        cat
+    fi
+}
+
+
+colourIndex=0
+
+while :
+do
+    for slotGroup in $WM_HOSTS
+    do
+        # split 'host:N', but catch 'host:' and 'host' too
+        host=${slotGroup%%:*}
+        n=${slotGroup##*:}
+        if [ "$n" = "$host" ]; then n=1; fi # missing ':'
+        : ${n:=1}
+
+        i=0
+        while [ "$i" -lt "$n" ]
+        do
+            lockFile="$lockDir/$host:$i"
+            if lockfile -r0 "$lockFile" 2>/dev/null; then
+                # Set colour
+                colour=${colours[$colourIndex]}
+                #echo "** host=$host  colourIndex=$colourIndex  colour=$colour"
+
+                if [ "$host" = "$HOST" ]; then
+                    if [ "$colour" ]; then
+                        eval $* 2>&1 | colourPipe $colour
+                    else
+                        eval $*
+                    fi
+                elif [ -n "$JOB_ID" ]; then
+                    qrsh -inherit -v PWD $host "$rcmd"
+                else
+                    if [ "$colour" ]; then
+                        ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe $colour
+                    else
+                        ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd"
+                    fi
+                fi
+                retval=$?
+
+                # Release lock
+                rm -f "$lockFile" 2>/dev/null
+                exit $retval
+            fi
+            i=$(expr $i + 1)
+
+            # Cycle through colours
+            colourIndex=$(expr $colourIndex + 1)
+            if (( $colourIndex >= $nColours )); then
+                colourIndex=0
+            fi
+        done
+    done
+done
+
+if [ "$WM_COLOURS" ]; then
+    setterm -foreground default
+fi
+
+#------------------------------------------------------------------------------