zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2011-06-06 12:22:11 +01:00
parent 4f4decc4b9 34080f13e3
commit 788aa9318e
18 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/combustion/fireFoam/Make/options
View File

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

2
applications/solvers/combustion/fireFoam/combustionModels/Make/files
View File

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

1
src/Allwmake
View File

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

0
src/thermophysicalModels/combustionModels/Make/files → src/combustionModels/Make/files
View File

0
src/thermophysicalModels/combustionModels/Make/options → src/combustionModels/Make/options
View File

0
src/thermophysicalModels/combustionModels/combustionModel/combustionModel.C → src/combustionModels/combustionModel/combustionModel.C
View File

0
src/thermophysicalModels/combustionModels/combustionModel/combustionModel.H → src/combustionModels/combustionModel/combustionModel.H
View File

0
src/thermophysicalModels/combustionModels/combustionModel/combustionModelNew.C → src/combustionModels/combustionModel/combustionModelNew.C
View File

0
src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C → src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
View File

0
src/thermophysicalModels/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H → src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
View File

0
src/thermophysicalModels/combustionModels/noCombustion/noCombustion.C → src/combustionModels/noCombustion/noCombustion.C
View File

0
src/thermophysicalModels/combustionModels/noCombustion/noCombustion.H → src/combustionModels/noCombustion/noCombustion.H
View File

2
src/lagrangian/spray/clouds/Templates/SprayCloud/SprayCloudI.H
View File

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

2
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H
View File

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

2
src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
View File

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

11
src/regionModels/thermoBaffleModels/thermoBaffle2D/thermoBaffle2D.H
View File

@ -8,10 +8,10 @@
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License as published by
Free Software Foundation; either version 2 of the License, or (at your the Free Software Foundation, either version 3 of the License, or
option) any later version. (at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details. for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::thermoBaffle2D Foam::thermoBaffle2D

2
src/thermophysicalModels/Allwmake
View File

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

2
src/thermophysicalModels/solidChemistryModel/Make/options
View File

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