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

Merge branch 'master' into cvm

Browse Source 
Conflicts:
	src/meshTools/searchableSurface/closedTriSurfaceMesh.C
	src/meshTools/searchableSurface/closedTriSurfaceMesh.H
This commit is contained in:
mattijs
2011-07-20 18:18:22 +01:00
parent 4da59cd060 20ee919028
commit d205a84e8d
333 changed files with 8489 additions and 35874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/bashrc
View File

@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=dev
export WM_PROJECT_VERSION=dev.cvm
################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

12
etc/config/settings.csh
View File

@ -209,10 +209,10 @@ case ThirdParty:
breaksw
case Gcc46:
case Gcc46++0x:
set gcc_version=gcc-4.6.0
set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.2
set mpc_version=mpc-0.8.1
set gcc_version=gcc-4.6.1
set gmp_version=gmp-5.0.2
set mpfr_version=mpfr-3.0.1
set mpc_version=mpc-0.9
breaksw
case Gcc45:
case Gcc45++0x:
@ -236,8 +236,8 @@ case ThirdParty:
# using clang - not gcc
setenv WM_CC 'clang'
setenv WM_CXX 'clang++'
set clang_version=llvm-2.9
#set clang_version=llvm-svn
#set clang_version=llvm-2.9
set clang_version=llvm-svn
breaksw
default:
echo

13
etc/config/settings.sh
View File

@ -228,10 +228,11 @@ OpenFOAM | ThirdParty)
mpfr_version=mpfr-2.4.2
;;
Gcc46 | Gcc46++0x)
gcc_version=gcc-4.6.0
gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.2
mpc_version=mpc-0.8.1
gcc_version=gcc-4.6.1
gmp_version=gmp-5.0.2
mpfr_version=mpfr-3.0.1
mpc_version=mpc-0.9
gmpPACKAGE=gmp-5.0.2
;;
Gcc45 | Gcc45++0x)
gcc_version=gcc-4.5.2
@ -253,8 +254,8 @@ OpenFOAM | ThirdParty)
# using clang - not gcc
export WM_CC='clang'
export WM_CXX='clang++'
clang_version=llvm-2.9
#clang_version=llvm-svn
#clang_version=llvm-2.9
clang_version=llvm-svn
;;
*)
echo

2
etc/controlDict
View File

@ -24,7 +24,6 @@ Documentation
"$WM_PROJECT_USER_DIR/html"
"~OpenFOAM/html"
"$WM_PROJECT_DIR/doc/Doxygen/html"
"$WM_PROJECT_DIR/doc/doxygen/html"
);
doxySourceFileExts
(
@ -38,6 +37,7 @@ InfoSwitches
{
writePrecision 6;
writeJobInfo 0;
writeDictionaries 0;
// Allow case-supplied C++ code (#codeStream, codedFixedValue)
allowSystemOperations 0;

2
etc/cshrc
View File

@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
setenv WM_PROJECT_VERSION dev
setenv WM_PROJECT_VERSION dev.cvm #dev
################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade