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
3,770 Commits 118 Branches 34 Tags
ad5a8d8f23db0b695b51a3e4925fd915cc00e014
Commit Graph

58 Commits

Author SHA1 Message Date
graham
f7b229d47c Merge branch 'master' into cvm 2009-08-04 14:31:32 +01:00
Mark Olesen
efce737693 Add provisioning for gcc-4.4.1 
- compile into linux64Gcc44, linuxGcc44 to avoid clashes during testing
- continue to use gmp-4.2.4 since gmp-4.3.x might be miscompiled with
  a system gcc-4.3.2
 2009-07-29 09:59:16 +02:00
graham
2d2c8cf8bc Merge branch 'master' into cvm 2009-07-28 10:40:50 +01:00
Mark Olesen
ea14d8f8b4 Merge commit 'OpenCFD/master' into olesenm 2009-07-20 14:38:38 +02:00
henry
9b44034d8c Changed more references to wmake/utilbin to wmake/bin. 2009-07-20 11:02:57 +01:00
Mark Olesen
f48b841973 mkdep rule was still using utilbin/ directory 2009-07-20 09:15:30 +02:00
Mark Olesen
dbf3d84560 Merge commit 'OpenCFD/master' into olesenm 2009-07-17 17:08:30 +02:00
henry
6b3ceaf4b5 Removed support for Java. 2009-07-17 09:30:36 +01:00
Mark Olesen
33358fd383 fix wmake bug introduced by a9699afbb4 
- skip including java rather than having recursive includes
  (and too many files open error) when WM_JAVAC_OPTION isn't defined.
 2009-07-16 13:32:40 +02:00
Mark Olesen
75080ab867 dropped pvm 2009-07-15 13:34:51 +02:00
Mark Olesen
0e5e84f4ed removed last remnants of LAM support 2009-07-15 12:26:12 +02:00
graham
0cbe8c8466 Fixing snappyHexMesh tut conflict 2009-07-06 14:40:38 +01:00
henry
218b2baec4 Changed SP and DP to WM_SP and WM_DP. 2009-07-03 11:46:45 +01:00
graham
c6ee712a17 Merge branch 'master' into cvm 2009-06-24 16:00:19 +01:00
henry
0bb012d0c2 Corrected handling of loop macros and removed those for PtrList. 2009-06-23 20:43:51 +01:00
graham
9d7e795414 Merge branch 'master' into cvm 2009-06-23 16:18:49 +01:00
henry
dfbf96c4c8 Added new warning message. 2009-06-23 12:12:17 +01:00
Henry Weller
65a9101d2e More warning messages. 2009-06-22 21:04:30 +01:00
Henry Weller
3345fd8378 Removed support for cint. 2009-06-22 21:03:57 +01:00
graham
f35943a8a7 Tidying up CGAL and boost inclusion. Removed the CGAL_PATH variable, using 
CGAL_SRC for everything.  Changed location of CGAL_FILES "files".

Updated old meshers with new options.

in .bashrc using this environment:

~~~~~~~~~~~
export BOOST_LIB_VERSION=1_39
export BOOST_PATCH_LEVEL=_0
export BOOST_COMPILER=gcc43

export BOOST_VERSION=$BOOST_LIB_VERSION$BOOST_PATCH_LEVEL
export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$BOOST_VERSION

export CGAL_VERSION=3.4
export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$CGAL_VERSION
~~~~~~~~~~~

and have written a script call makeCGAL to build and configure boost and CGAL:

~~~~~~~~~~~

BOOST_ARCH_PATH=${BOOST_ROOT}/platforms/${WM_OPTIONS}

cd ${BOOST_ROOT}

rm -rf ${BOOST_ARCH_PATH}

./bootstrap.sh \
    --with-libraries=thread \
    --libdir=$BOOST_ARCH_PATH/lib \
    --includedir=$BOOST_ROOT/include

if [ -r /proc/cpuinfo ]
then
    WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
    [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8

    time ./bjam -j $WM_NCOMPPROCS install
else
    time ./bjam install
fi

    echo "Done boost"

    cd ${CGAL_SRC}

BOOST_VERSION_NO=`grep "#define BOOST_VERSION " \
    ${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}/boost/version.hpp \
    | cut -d " " -f 3`

cmake \
    -DGMP_INCLUDE_DIR=${WM_THIRD_PARTY_DIR}/gmp-4.2.4 \
    -DGMP_LIBRARIES_DIR=${WM_THIRD_PARTY_DIR}/gmp-4.2.4/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib \
    -DGMP_LIBRARIES=${WM_THIRD_PARTY_DIR}/gmp-4.2.4/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib/libgmp.so \
    -DMPFR_INCLUDE_DIR=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1 \
    -DMPFR_LIBRARIES_DIR=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib \
    -DMPFR_LIBRARIES=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib/libmpfr.so \
    -DBoost_INCLUDE_DIR=${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION} \
    -DBoost_LIBRARY_DIRS=$BOOST_ARCH_PATH/lib \
    -DBoost_THREAD_LIBRARY=$BOOST_ARCH_PATH/lib/libboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION}.so \
    -DBoost_THREAD_LIBRARY_RELEASE=$BOOST_ARCH_PATH/lib/libboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION}.so \
    -DBoost_VERSION=$BOOST_VERSION_NO \
    ${CGAL_SRC}

echo "\${CGAL_SRC}/src/CGAL/assertions.cpp" > ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/MP_Float.cpp" >> ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/Random.cpp" >> ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/io.cpp" >> ${CGAL_SRC}/src/CGAL/files

echo "Done CGAL"
 2009-05-28 20:39:03 +01:00
graham
901bd023c3 Modifying options for building with boost to make sure that the ThirdParty 
version is being used.
 2009-05-28 17:35:47 +01:00
graham
428d629d95 Merge branch 'master' into cvm 2009-05-18 11:59:50 +01:00
Mark Olesen
1cdbeb29d7 minor tweak to wmake 
- place wmkdep and dirToString executables under
  utilbin/$(WM_ARCH)$(WM_COMPILER).
  This helps somewhat when copying rules about, and might help when creating
  general rules.
 2009-05-06 15:56:29 +02:00
Mark Olesen
51f443a345 Merge commit 'OpenCFD/master' into olesenm 
Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

Can't use [0] to assign the first value of a DynamicList unless it has been
preceded by a setSize() - use append() instead.
 2009-05-06 09:33:38 +02:00
graham
d781dcf38c Merge branch 'master' into cvm 2009-05-01 10:11:25 +01:00
Mark Olesen
433b209702 update to openmpi-1.3.2, prepare for newly released gcc-4.4 
- added rules for gcc-4.3 in preparation for switching to gcc-4.4

- added 'clean' target for wmake/src/Makefile
  It is probably reasonable to separate the binaries from the rules (TODO)
 2009-04-30 08:32:48 +02:00
mattijs
b773710d06 remove opteron and no-gcse switch 
modified:   SiCortex64Gcc/cOpt
	modified:   SunOS64Gcc/cOpt
	modified:   linux64Gcc/c++Opt
	modified:   linux64Gcc/cOpt
	modified:   linux64Gcc/general
	modified:   linux64Gcc42/c++Opt
	modified:   linux64Gcc42/cOpt
	modified:   linuxGcc/c++
	modified:   linuxGcc/cDebug
	modified:   linuxGcc/general
	modified:   linuxIA64Gcc/cOpt
 2009-04-28 22:20:12 +01:00
graham
3e445d422c Modifying decompositionMethods Make/options to add librt, required on 64bit 
openSUSE 11.1.  Added 20 to the template depth for all architectures for CGAL.
 2009-04-28 11:07:19 +01:00
graham
ff66dc68d4 Merge branch 'master' into cvm 2009-04-25 13:47:54 +01:00
mattijs
de2a74b2fa use gcc, not g++ for flex 2009-04-23 16:20:57 +01:00
mattijs
2c48a69e50 scotch decomposition method 2009-04-23 14:44:23 +01:00
graham
ef1c6a201f Merge branch 'master' into cvm 2009-04-03 18:16:53 +01:00
henry
9c95fd034b Added initial support for LinuxPPC. 2009-04-02 12:26:41 +01:00
graham
76210e7dff Merge branch 'master' into cvm 2009-04-01 17:15:07 +01:00
henry
4dedd47382 Changed the option to select the generation of a C++ scanner to the backward compatible -+. 2009-03-31 20:14:40 +01:00
graham
67f828d299 Changed to gcc 4.3.3, linking mpfr from ThirdParty to CV3DMesher. 2009-03-30 17:00:28 +01:00
graham
6218702064 Merge branch 'master' into cvm 2009-03-30 16:48:32 +01:00
henry
b2ad57c69b Added basic support for QsNet. 2009-03-28 19:53:06 +00:00
Graham
444ba19c00 Changing to boost 1.38 installed in ThirdParty. Setting template depth to 60, again. 2009-03-18 10:12:37 +00:00
mattijs
5afc0db5a8 Solaris port 2009-02-02 12:23:41 +00:00
Mark Olesen
0061e9ed03 added Foam::FOAMbuild to Foam::FOAMversion 
- avoids problems with finding files based on FOAMversion
  (reported by Mattijs)
 2009-01-09 09:11:50 +01:00
Mark Olesen
1cd18ce0b5 added wmakeLnIncludeAll - can be quite useful after a wcleanLnIncludeAll 2009-01-07 21:06:08 +01:00
mattijs
eb2e37b296 SiCortex port 2009-01-06 21:41:20 +00:00
henry
7386e4c94d Changed "flex++" to "flex --c++" to avoid the need to create the link from "flex" to "flex++" after installing "flex". 2008-12-30 19:02:45 +00:00
Mark Olesen
0c5571519f changes to build version string 
- version is WM_PROJECT_VERSION prefix + SHA1 from current git head
- move double quotes from make rules to global.Cver for extra safety
 2008-12-19 13:20:14 +01:00
Mark Olesen
5f7d2acb9c tweaked build version strings 
- added wmakePrintBuild -check, -update, -version options
- only update .build cache when explictly requested and
  from within the wmake Cver rules
- use -check option to avoid unnecessary remake in src/Allwmake
 2008-12-19 12:13:08 +01:00
Mark Olesen
6a4b83bc43 Added wmakePrintBuild for determining the build version 
- the $WM_PROJECT_DIR/.build file is automatically updated.
  This file is (and must be) ignored by git.
 2008-12-19 11:11:20 +01:00
Mark Olesen
b5f06a3833 use git describe for header version, but use existing wmake framework 2008-12-18 19:54:13 +01:00
henry
16e9f10e22 Added support for HP-MPI. 2008-11-19 14:57:06 +00:00
andy
2a424fddab using Graham's latest CGAL wmake rules 2008-07-24 14:40:53 +01:00