Commit Graph

4896 Commits

Author SHA1 Message Date
279df4d0e6 merge into master 2009-06-05 17:40:08 +01:00
44a01db5bc updates to conform with explicitCellSource 2009-06-05 16:35:35 +01:00
e68480913f pd => p 2009-06-04 19:11:12 +01:00
f74cd78829 Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-04 17:36:12 +01:00
c593fa63e5 pd => p 2009-06-04 17:35:47 +01:00
fd17f2bdb7 test application for extended stencils 2009-06-04 17:30:57 +01:00
33e452f4d3 inclusion of point mass sources 2009-06-03 19:40:33 +01:00
2bb2266872 updates to sources 2009-06-03 19:40:16 +01:00
f20792493d New, improved with p rather than pd, PIMPLE rather than PISO and more general handling of the diffusivity. 2009-06-03 14:59:35 +01:00
1002f8d07f Changed to use p rather than pd. 2009-06-03 14:58:30 +01:00
3233ed6428 moved construction of carrier props to reacting cloud constructor 2009-06-03 11:02:43 +01:00
c766b6c301 more fun with templates - templating thermo type throughout submodels 2009-06-02 19:55:56 +01:00
918a34dca4 surface redistribution 2009-06-02 17:47:51 +01:00
fef0256620 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-02 15:19:47 +01:00
041c48cc3a changed comment 2009-06-02 15:11:45 +01:00
dcc957147b solving p instead of pd; parallel coupled b.c. 2009-06-02 14:55:33 +01:00
4e2dbe6598 added option to use time name instead of time index for file names 2009-06-02 10:41:32 +01:00
d07403b308 templated thermo type 2009-06-01 19:21:21 +01:00
da89474c3b use direct mapping 2009-06-01 13:24:10 +01:00
d18719dd15 Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-01 12:31:02 +01:00
461e40db22 removing unused T variable 2009-06-01 11:45:23 +01:00
d15041b5df correcting error with units 2009-05-29 18:59:01 +01:00
0d441221f0 added mult-component point mass flow sources 2009-05-29 16:08:09 +01:00
6842c643b9 renamed Lagrangian->lagrangian to be consistent with sources 2009-05-29 15:50:35 +01:00
435baa393d usage FOAM_USER_APPBIN 2009-05-29 15:37:50 +01:00
ef5a7f6741 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 15:34:10 +01:00
feb846bd43 work around scotch fpe bug 2009-05-29 15:27:55 +01:00
20dcad4e57 Added the reciprocal of the turbulent Schmidt number. 2009-05-29 11:03:20 +01:00
46ca766a4b Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 09:33:58 +01:00
47beddc1c1 Added output of the patch area magnitude and the integral over the patch area magnitude. 2009-05-29 09:33:47 +01:00
1d14951bf5 Added turbulent diffusivity. 2009-05-29 09:32:32 +01:00
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
e989229407 now building to APPBIN instead of USER_APPBIN 2009-05-28 19:01:37 +01:00
531f3c06b9 removing references to /home/shelob2/andy/OpenFOAM/andy-dev.FT/lib/linux64GccDPOpt 2009-05-28 18:58:53 +01:00
55f5241fc8 output wallDistance 2009-05-28 18:14:38 +01:00
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
5969f1629c updates 2009-05-27 19:05:26 +01:00
2a1236c0c2 updates 2009-05-27 16:49:58 +01:00
549e72dff2 decomposing meshes in time directories 2009-05-26 21:43:00 +01:00
85e5abd344 updates + added porous zones 2009-05-26 12:01:39 +01:00
f191a42448 Merge branch 'master' into cvm 2009-05-24 12:07:45 +01:00
02b6d0c661 adding new particle tracks app - needs work... 2009-05-22 17:03:49 +01:00
4ec0c9d174 new solver 2009-05-22 16:37:34 +01:00
71a73d9490 removing duplicate file 2009-05-22 11:57:05 +01:00
10c2f6bee0 Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-21 10:13:42 +01:00
8416ec4ebc merging master, fixing conflict in surfaceFeatureExtract. 2009-05-20 18:40:50 +01:00
c7ab2fcc4c changed field name 2009-05-20 16:05:10 +01:00
8edf105c45 cleanup of time handling (cosmetic changes), used timeSelector in more places 2009-05-20 15:40:30 +02:00
7941b04785 Merge commit 'OpenCFD/master' into olesenm 2009-05-19 21:15:56 +02:00
d1295da31f adjust solvers and utilities to use new argList methods
- also drop various unused time options from src/OpenFOAM/include
2009-05-19 20:21:50 +02:00