diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index 045e37a344ae3f45dcc991ccb430c3144287ba0b..9f7a66b39e38bd6c8e73320f22a01b59bd83e2a9 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/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 \
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/Make/files b/applications/solvers/combustion/fireFoam/combustionModels/Make/files
index 5b1262b70d476c5b469d5fcad4404f3a75f08512..bef447f0b0d9bf3da970aca33fdb029843e3ca33 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/Make/files
+++ b/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
diff --git a/src/Allwmake b/src/Allwmake
index b1bbcea8099864ceeacd7f1235e4a58861c2b0bf..aa17b418e3004a77619c10fb2c5d0593b3c1c8ea 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -60,6 +60,7 @@ wmake $makeType randomProcesses
thermophysicalModels/Allwmake $*
transportModels/Allwmake $*
turbulenceModels/Allwmake $*
+wmake $makeType combustionModels
regionModels/Allwmake $*
lagrangian/Allwmake $*
postProcessing/Allwmake $*
diff --git a/src/thermophysicalModels/combustionModels/Make/files b/src/combustionModels/Make/files
similarity index 100%
rename from src/thermophysicalModels/combustionModels/Make/files
rename to src/combustionModels/Make/files
diff --git a/src/thermophysicalModels/combustionModels/Make/options b/src/combustionModels/Make/options
similarity index 100%
rename from src/thermophysicalModels/combustionModels/Make/options
rename to src/combustionModels/Make/options
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModel.C b/src/combustionModels/combustionModel/combustionModel.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModel.C
rename to src/combustionModels/combustionModel/combustionModel.C
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModel.H
rename to src/combustionModels/combustionModel/combustionModel.H
diff --git a/src/thermophysicalModels/combustionModels/combustionModel/combustionModelNew.C b/src/combustionModels/combustionModel/combustionModelNew.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/combustionModel/combustionModelNew.C
rename to src/combustionModels/combustionModel/combustionModelNew.C
diff --git a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
rename to src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
diff --git a/src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
rename to src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
diff --git a/src/thermophysicalModels/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C
similarity index 100%
rename from src/thermophysicalModels/combustionModels/noCombustion/noCombustion.C
rename to src/combustionModels/noCombustion/noCombustion.C
diff --git a/src/thermophysicalModels/combustionModels/noCombustion/noCombustion.H b/src/combustionModels/noCombustion/noCombustion.H
similarity index 100%
rename from src/thermophysicalModels/combustionModels/noCombustion/noCombustion.H
rename to src/combustionModels/noCombustion/noCombustion.H
diff --git a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H b/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
index a5037f79fe0612fa3dbd94a74ecc079c206188ca..2075212a8fee8d501fd61f5b6d751e3b10a9f09e 100644
--- a/src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
+++ b/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
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
index da87dc91fccbf16be2d4199d115aa011fd807e5b..e57f11d88151e026d43a1bf6f49aa77b420700eb 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
+++ b/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
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index a4c66ce964f0978e94c5850592730af34678c844..b982da5b8af2920ed78ce9e4b673479d8bca6840 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/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
diff --git a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H b/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
index c35cdc1640d0a7150b73a625f67f913f50baf571..8cd28b76e52f5edd2b81808f2dab4bcff7eee4c9 100644
--- a/src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
+++ b/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
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index c27c4b6648b571862abc07df50be1f20bb7318b4..7927a97e693260e8d39e0d29c45cfe5ee2f4d526 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/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
diff --git a/src/thermophysicalModels/solidChemistryModel/Make/options b/src/thermophysicalModels/solidChemistryModel/Make/options
index d989adfd5b0b9e850169536fa5c1f17317bbc717..2a5d76bca79f99a7cd056bc0307aa6ea01921020 100644
--- a/src/thermophysicalModels/solidChemistryModel/Make/options
+++ b/src/thermophysicalModels/solidChemistryModel/Make/options
@@ -10,6 +10,6 @@ EXE_INC = \
LIB_LIBS = \
- -chemistryModel \
+ -lchemistryModel \
-lfiniteVolume \
-lODE