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

applications/solvers/combustion/fireFoam/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I./combustionModels/lnInclude \
+    -IcombustionModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -9,7 +9,7 @@ EXE_INC = \
 
 
 EXE_LIBS = \
-    -lcombustionModels \
+    -lfireFoamCombustionModels \
     -lspecie \
     -lreactionThermophysicalModels \
     -lbasicThermophysicalModels \

applications/solvers/combustion/fireFoam/combustionModels/Make/files

@@ -5,5 +5,5 @@ infinitelyFastChemistry/infinitelyFastChemistry.C
 
 noCombustion/noCombustion.C
 
-LIB = $(FOAM_LIBBIN)/libcombustionModels
+LIB = $(FOAM_LIBBIN)/libfireFoamCombustionModels
 

src/Allwmake

@@ -60,6 +60,7 @@ wmake $makeType randomProcesses
 thermophysicalModels/Allwmake $*
 transportModels/Allwmake $*
 turbulenceModels/Allwmake $*
+wmake $makeType combustionModels
 regionModels/Allwmake $*
 lagrangian/Allwmake $*
 postProcessing/Allwmake $*

src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2011 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H

@@ -8,10 +8,10 @@
 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 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 3 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
@@ -19,8 +19,7 @@ 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
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
     Foam::thermoBaffle2D

src/thermophysicalModels/Allwmake

@@ -20,8 +20,6 @@ wmake $makeType SLGThermo
 wmake $makeType basicSolidThermo
 wmake $makeType solidChemistryModel
 
-wmake $makeType combustionModels
-
 wmake $makeType radiationModels
 
 # ----------------------------------------------------------------- end-of-file

src/thermophysicalModels/solidChemistryModel/Make/options

@@ -10,6 +10,6 @@ EXE_INC = \
 
 
 LIB_LIBS = \
-    -chemistryModel \
+    -lchemistryModel \
     -lfiniteVolume \
     -lODE