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

3770 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattijs
ef5a7f6741 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 15:34:10 +01:00
mattijs
1589afb960 added localSize member function 2009-05-29 15:28:26 +01:00
mattijs
feb846bd43 work around scotch fpe bug 2009-05-29 15:27:55 +01:00
henry
80175df2dd Changed the BC to switch between "pd" and static pressure according to the variable name. 2009-05-29 11:57:15 +01:00
henry
20dcad4e57 Added the reciprocal of the turbulent Schmidt number. 2009-05-29 11:03:20 +01:00
andy
47e65edf73 added check to ensure that all wall patches are specified 2009-05-29 10:40:52 +01:00
henry
46ca766a4b Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 09:33:58 +01:00
henry
47beddc1c1 Added output of the patch area magnitude and the integral over the patch area magnitude. 2009-05-29 09:33:47 +01:00
henry
1d14951bf5 Added turbulent diffusivity. 2009-05-29 09:32:32 +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
andy
765178f0c4 adding new patch interaction model to parcel builds 2009-05-28 19:03:05 +01:00
andy
8f9c3b9a58 new patch interaction model 2009-05-28 19:02:17 +01:00
andy
e989229407 now building to APPBIN instead of USER_APPBIN 2009-05-28 19:01:37 +01:00
andy
f6c4cd9a3a added message 2009-05-28 19:00:43 +01:00
andy
531f3c06b9 removing references to /home/shelob2/andy/OpenFOAM/andy-dev.FT/lib/linux64GccDPOpt 2009-05-28 18:58:53 +01:00
mattijs
0100aa87fd Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-28 18:22:47 +01:00
mattijs
1779687e3d duplicate function removed 2009-05-28 18:22:38 +01:00
mattijs
d4d4f72827 optional reading of writeGraph 2009-05-28 18:15:16 +01:00
mattijs
6c2996cac4 correction from Hilary 2009-05-28 18:14:53 +01:00
mattijs
55f5241fc8 output wallDistance 2009-05-28 18:14:38 +01:00
andy
d83f9991ed added PostProcessingModel entry 2009-05-28 18:13:02 +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
andy
1649cd1844 refactored wall interaction to patch interaction 2009-05-28 17:13:01 +01:00
andy
4367ff382f removed clause in if-statement - code could never be executed 2009-05-28 16:33:16 +01:00
andy
0a97692857 bugfix: changed order of logic to prevent hand on redude in parallel 2009-05-28 11:46:54 +01:00
andy
3a32131ccd Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-27 19:25:27 +01:00
andy
fd9cf0c1f6 removed kappa from argument list - not used 2009-05-27 19:23:05 +01:00
andy
66cd363092 updated 2009-05-27 19:22:35 +01:00
andy
5969f1629c updates 2009-05-27 19:05:26 +01:00
andy
0e75278db9 bugfix: << operator 2009-05-27 18:29:49 +01:00
andy
eb94b1c7cd bugfix: << operator 2009-05-27 18:29:49 +01:00
andy
2ab359f087 codmetics 2009-05-27 18:29:21 +01:00
andy
2a1236c0c2 updates 2009-05-27 16:49:58 +01:00
andy
1454fb053e added nParcels argument to functions 2009-05-27 14:51:59 +01:00
andy
1d8010fc8c added new family of injection models 2009-05-27 14:49:18 +01:00
andy
daacf80cff added scalarIOList 2009-05-27 14:47:19 +01:00
andy
87cfd68f32 added PostProcessingModel entry 2009-05-27 14:46:24 +01:00
mattijs
549e72dff2 decomposing meshes in time directories 2009-05-26 21:43:00 +01:00
andy
85e5abd344 updates + added porous zones 2009-05-26 12:01:39 +01:00
andy
48d003675a using new setProperties method for new particles 2009-05-26 11:25:15 +01:00
andy
7209a42ec0 changed add new parcel functionality - now sets properties instead 2009-05-26 11:24:31 +01:00
andy
73374a5f8e updates to enable post-processing sub-models 2009-05-26 11:22:57 +01:00
andy
fbd5a8363f added new constructor 2009-05-26 11:22:04 +01:00
Mark Olesen
08f2d3a123 buildParaViewFunctions - warn/ignore QMAKE_PATH if it points somewhere silly 2009-05-25 10:00:40 +02:00
graham
2d5fa6d2e9 Moving edgeMesh compilation after meshTools. Adding conformalVoronoiMesh. 2009-05-24 14:12:08 +01:00
graham
f191a42448 Merge branch 'master' into cvm 2009-05-24 12:07:45 +01:00
andy
17d6b425fc removed coeffDict_ - already defind in parent injection model 2009-05-22 17:29:36 +01:00
andy
02b6d0c661 adding new particle tracks app - needs work... 2009-05-22 17:03:49 +01:00
andy
449be34db9 adding trackedXXX to build 2009-05-22 17:02:01 +01:00
andy
4ec0c9d174 new solver 2009-05-22 16:37:34 +01:00