Commit Graph

10204 Commits

Author SHA1 Message Date
6e9912753c updated hitPatch() to return true if particle remmains in original cell 2009-06-03 12:30:38 +01:00
3233ed6428 moved construction of carrier props to reacting cloud constructor 2009-06-03 11:02:43 +01:00
cba4af2700 furher updates to submodel instantiations 2009-06-03 10:28:51 +01:00
c766b6c301 more fun with templates - templating thermo type throughout submodels 2009-06-02 19:55:56 +01:00
fef0256620 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-02 15:19:47 +01:00
03edbb8bad tidying up 2009-06-01 19:51:13 +01:00
11c29be25f moved reactingParcel base class to ReactingParcel 2009-06-01 19:32:27 +01:00
d07403b308 templated thermo type 2009-06-01 19:21:21 +01:00
b19be17873 adding PostProcessingModel entry 2009-06-01 19:19:09 +01:00
c2c9681bff optional merging of sub-regions 2009-06-01 16:25:24 +01:00
b6b2fc5e75 added info statement giving name of proous zone on construction 2009-06-01 14:39:58 +01:00
ed73a70b95 input checking 2009-06-01 13:24:38 +01:00
83322a9041 using wordList of carrier gases instead of volScalarFields 2009-06-01 12:58:26 +01:00
e6ba4f8fb9 added return functions for speciesTable 2009-06-01 12:57:58 +01:00
37077ac188 added hitPatch functions 2009-06-01 11:54:19 +01:00
012f373b5a added lookup injection model 2009-05-29 18:27:47 +01:00
3620005bac bugfix - had forgotten to size sub-list 2009-05-29 18:27:26 +01:00
c82d9d9b23 Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 16:27:14 +01:00
fe2e219b68 added check for user supplied location in mesh 2009-05-29 16:13:17 +01:00
8d8f2d2c02 removed update() function 2009-05-29 16:07:41 +01:00
56dfd19024 initial commit of new multicomponent point source 2009-05-29 15:48:52 +01:00
107893383a usage FOAM_USER_APPBIN 2009-05-29 15:39:20 +01:00
ef5a7f6741 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 15:34:10 +01:00
1589afb960 added localSize member function 2009-05-29 15:28:26 +01:00
feb846bd43 work around scotch fpe bug 2009-05-29 15:27:55 +01:00
80175df2dd Changed the BC to switch between "pd" and static pressure according to the variable name. 2009-05-29 11:57:15 +01:00
47e65edf73 added check to ensure that all wall patches are specified 2009-05-29 10:40:52 +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
765178f0c4 adding new patch interaction model to parcel builds 2009-05-28 19:03:05 +01:00
8f9c3b9a58 new patch interaction model 2009-05-28 19:02:17 +01:00
f6c4cd9a3a added message 2009-05-28 19:00:43 +01:00
0100aa87fd Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-28 18:22:47 +01:00
1779687e3d duplicate function removed 2009-05-28 18:22:38 +01:00
d4d4f72827 optional reading of writeGraph 2009-05-28 18:15:16 +01:00
6c2996cac4 correction from Hilary 2009-05-28 18:14:53 +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
1649cd1844 refactored wall interaction to patch interaction 2009-05-28 17:13:01 +01:00
4367ff382f removed clause in if-statement - code could never be executed 2009-05-28 16:33:16 +01:00
0a97692857 bugfix: changed order of logic to prevent hand on redude in parallel 2009-05-28 11:46:54 +01:00
fd9cf0c1f6 removed kappa from argument list - not used 2009-05-27 19:23:05 +01:00
66cd363092 updated 2009-05-27 19:22:35 +01:00
0e75278db9 bugfix: << operator 2009-05-27 18:29:49 +01:00
eb94b1c7cd bugfix: << operator 2009-05-27 18:29:49 +01:00
2ab359f087 codmetics 2009-05-27 18:29:21 +01:00
1454fb053e added nParcels argument to functions 2009-05-27 14:51:59 +01:00
1d8010fc8c added new family of injection models 2009-05-27 14:49:18 +01:00
daacf80cff added scalarIOList 2009-05-27 14:47:19 +01:00
48d003675a using new setProperties method for new particles 2009-05-26 11:25:15 +01:00
7209a42ec0 changed add new parcel functionality - now sets properties instead 2009-05-26 11:24:31 +01:00
73374a5f8e updates to enable post-processing sub-models 2009-05-26 11:22:57 +01:00