Commit Graph

2745 Commits

Author SHA1 Message Date
9dba5f3e28 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-23 16:00:46 +01:00
8d70babf13 adding time and region options 2009-06-23 15:19:51 +01:00
75945b507f error check for zero cells 2009-06-23 13:16:00 +01:00
6aab448b9d Merge branch 'master' into cvm 2009-06-23 10:11:06 +01:00
cc6fe463cd updated since origProc and origId are now stored on the particle 2009-06-22 18:19:55 +01:00
4bb9d9c150 Merge branch 'master' into cvm 2009-06-22 16:30:20 +01:00
6a9dfcdc82 merge of thermo branch into master 2009-06-19 13:21:55 +01:00
6f1fdb6c21 Merge branch 'master' into molecularDynamics 2009-06-19 13:11:04 +01:00
687ac7e94e Merge branch 'dsmc' 2009-06-19 12:04:23 +01:00
0dcd37351b converting zones without reading mesh 2009-06-18 22:50:52 +01:00
0fd2a5f056 making stitchMesh,mergePatchPairs work 2009-06-18 20:35:55 +01:00
02ddfa98e1 Merging master, fixing conflict in searchableBox.C 2009-06-18 15:26:01 +01:00
0bfa0e8628 Merge branch 'master' into molecularDynamics 2009-06-18 15:19:57 +01:00
864e56d1df Merge branch 'master' into dsmc 2009-06-18 15:19:32 +01:00
8f5e38ac9c Modified copyright years, removed old molConfig. 2009-06-17 15:11:06 +01:00
edcf49af67 More modified copyright years 2009-06-17 14:59:34 +01:00
cd204331bf Modified copyright years 2009-06-17 14:27:52 +01:00
8900641265 not split concave angles by default 2009-06-17 13:37:53 +01:00
e92d84b7a9 extrudeMesh improvements 2009-06-16 16:44:35 +01:00
7d73dd3171 updates for new thermo and general code tidying 2009-06-15 15:36:57 +01:00
9af9f9c478 merging master into local branch 2009-06-11 17:29:19 +01:00
dee5c153ca Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-11 17:24:51 +01:00
1ebc1c1ad4 Merge branch 'FT' 2009-06-11 17:10:58 +01:00
42c240b97e cosmetics/code-tidying 2009-06-11 17:09:19 +01:00
4c2adfe276 Fixed!!! 2009-06-11 16:18:19 +01:00
c3c36e6b16 updated name change of combustion->reaction lib 2009-06-10 19:37:52 +01:00
3a4cd98671 update face flip map on zone 2009-06-09 14:18:37 +01:00
2d9ea72b6a allow -overwrite in snappyHexMesh 2009-06-09 14:02:10 +01:00
0903bf0b3b removed include file 2009-06-09 13:48:44 +01:00
466b95af86 use extrapolated cell-centre for testing;moved added patch information into meshRefinement class 2009-06-08 18:03:12 +01:00
279df4d0e6 merge into master 2009-06-05 17:40:08 +01:00
918a34dca4 surface redistribution 2009-06-02 17:47:51 +01:00
4e2dbe6598 added option to use time name instead of time index for file names 2009-06-02 10:41:32 +01:00
da89474c3b use direct mapping 2009-06-01 13:24:10 +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
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
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
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
02b6d0c661 adding new particle tracks app - needs work... 2009-05-22 17:03:49 +01:00
8416ec4ebc merging master, fixing conflict in surfaceFeatureExtract. 2009-05-20 18:40:50 +01:00
8edf105c45 cleanup of time handling (cosmetic changes), used timeSelector in more places 2009-05-20 15:40:30 +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
428d629d95 Merge branch 'master' into cvm 2009-05-18 11:59:50 +01:00
72362de6b1 foamToEnsight* fixes and tweaks
foamToEnsight:
    - add -noPatches option
    - had incorrect part# when the internalMesh was not output
    - case file is always ascii

foamToEnsightParts:
    - fixed field selection bug,
      no fields were selected when a single time-step was selected
2009-05-12 12:37:25 +02:00