Merge commit 'OpenCFD/master' into olesenm

applications/solvers/heatTransfer/buoyantBoussinesqFoam/Make/files

-buoyantBoussinesqFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantBoussinesqFoam

applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/Make/files

+buoyantBoussinesqPisoFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantBoussinesqPisoFoam

applications/solvers/heatTransfer/buoyantBoussinesqFoam/buoyantBoussinesqFoam.C → applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C

@@ -23,10 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    buoyantBoussinesqSimpleFoam
+    buoyantBoussinesqPisoFoam
 
 Description
-    Steady-state solver for buoyant, turbulent flow of incompressible fluids
+    Transient solver for buoyant, turbulent flow of incompressible fluids
 
     Uses the Boussinesq approximation:
     \f[

applications/solvers/heatTransfer/buoyantFoam/Make/files

-buoyantFoam.C
-
-EXE = $(FOAM_APPBIN)/buoyantFoam

applications/solvers/heatTransfer/buoyantPisoFoam/Make/files

+buoyantPisoFoam.C
+
+EXE = $(FOAM_APPBIN)/buoyantPisoFoam

applications/solvers/heatTransfer/buoyantFoam/buoyantFoam.C → applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C

@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
-    buoyantFoam
+    buoyantPisoFoam
 
 Description
     Transient Solver for buoyant, turbulent flow of compressible fluids for

applications/utilities/postProcessing/dataConversion/hashTableUnion.H

-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 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
-
-Class
-    Foam::hashTableUnionEqOp
-
-Description
-    Union operation to combine hash sets
-    Usage: combineReduce(myWordHashSet, unionEqOp<word>());
-
-\*---------------------------------------------------------------------------*/
-
-namespace Foam
-{
-    template<class Type>
-    class hashTableUnionEqOp
-    {
-        public:
-        void operator()(HashTable<Type>& x, const HashTable<Type>& y) const
-        {
-            forAllConstIter(typename HashTable<Type>, y, iter)
-            {
-                x.insert(iter.key(), iter());
-            }
-        }
-    };
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

bin/tools/inlineReplace

+#!/bin/sh
+
+# $0 string1 string2 file1 .. filen
+#
+if [ $# -lt 3 ]; then
+    echo "Usage: `basename $0` [-f] <string1> <string2> <file1> .. <filen>"
+    echo ""
+    echo "Replaces all occurrences of string1 by string2 in files."
+    echo "(replacement of sed -i on those systems that don't support it)"
+    exit 1
+fi
+
+FROMSTRING=$1
+shift
+TOSTRING=$1
+shift
+
+for f in $*
+do
+    if grep "$FROMSTRING" "$f" >/dev/null
+    then
+        cp "$f" "${f}_bak"
+        sed -e "s@$FROMSTRING@$TOSTRING@g" "${f}"_bak > "$f"
+        rm -f "${f}"_bak
+    #else
+    #    echo "String $FROMSTRING not present in $f"
+    #fi
+done