diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 045e37a344..9f7a66b39e 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 5b1262b70d..bef447f0b0 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 b1bbcea809..aa17b418e3 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 a5037f79fe..2075212a8f 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 da87dc91fc..e57f11d881 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 a4c66ce964..b982da5b8a 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 c35cdc1640..8cd28b76e5 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 . Class Foam::thermoBaffle2D diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index c27c4b6648..7927a97e69 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 d989adfd5b..2a5d76bca7 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