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

36ea34fb · Mattijs Janssens · 0edb41f4 · 6519ade1 · 36ea34fb · 36ea34fb
Commit 36ea34fb authored 17 years ago by Mattijs Janssens
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 *.bak

 # CVS recovered versions - anywhere
-.#*
+*\#*\#

 # objects and archives - anywhere
 *.[oa]

--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/constant/turbulenceProperties
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/constant/turbulenceProperties
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSchemes
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSchemes
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSolution
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/defaults/system/fvSolution
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/dnsFoam.cfg
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/dnsFoam.cfg
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSchemes.cfg
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSchemes.cfg
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSolution.cfg
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/fvSolution.cfg
--- a/applications/solvers/DNSandLES/dnsFoam/FoamX/turbulenceProperties.cfg
+++ b/applications/solvers/DNSandLES/dnsFoam/FoamX/turbulenceProperties.cfg
--- a/applications/solvers/DNSandLES/dnsFoam/Make/files
+++ b/applications/solvers/DNSandLES/dnsFoam/Make/files
--- a/applications/solvers/DNSandLES/dnsFoam/Make/options
+++ b/applications/solvers/DNSandLES/dnsFoam/Make/options
--- a/applications/solvers/DNSandLES/dnsFoam/createFields.H
+++ b/applications/solvers/DNSandLES/dnsFoam/createFields.H
--- a/applications/solvers/DNSandLES/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNSandLES/dnsFoam/dnsFoam.C
--- a/applications/solvers/DNSandLES/dnsFoam/globalProperties.H
+++ b/applications/solvers/DNSandLES/dnsFoam/globalProperties.H
--- a/applications/solvers/DNSandLES/dnsFoam/readTransportProperties.H
+++ b/applications/solvers/DNSandLES/dnsFoam/readTransportProperties.H
--- a/applications/solvers/DNSandLES/dnsFoam/readTurbulenceProperties.H
+++ b/applications/solvers/DNSandLES/dnsFoam/readTurbulenceProperties.H
--- a/applications/solvers/DNSandLES/coodles/FoamX/coodles.cfg
+++ b/applications/solvers/DNSandLES/coodles/FoamX/coodles.cfg
--- a/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSchemes
+++ b/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSchemes
--- a/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSolution
+++ b/applications/solvers/DNSandLES/coodles/FoamX/defaults/system/fvSolution
--- a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes.cfg
+++ b/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes.cfg
--- a/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/divSchemes.cfg
+++ b/applications/solvers/DNSandLES/coodles/FoamX/fvSchemes/divSchemes.cfg