Commit Graph

242 Commits

Author SHA1 Message Date
graham
5f50cd5f29 Closing brace in wrong place, non internalOrBoundaryPoint Dvs asked for
alignment which was uninitialised.
2009-07-11 12:49:34 +01:00
graham
1dbb7bb393 Merge branch 'master' into cvm 2009-07-10 11:39:45 +01:00
henry
37b0fe0ade Corrections to get the tutorial test loop to run cleanly. 2009-07-09 23:28:54 +01:00
mattijs
e6cdada5d6 correct extrudeMesh 2009-07-09 16:01:36 +01:00
mattijs
4c13ef589b faceZone checking. wip 2009-07-09 11:57:21 +01:00
graham
db77abe02b Merge branch 'master' into cvm 2009-07-09 10:24:23 +01:00
mattijs
9015b7f493 added comment 2009-07-07 18:54:19 +01:00
mattijs
3d6be6aa5e expand on case directory 2009-07-07 15:48:18 +01:00
mattijs
6acfd6a3ae execute bit set 2009-07-07 15:48:04 +01:00
mattijs
d02e3f1468 unused files 2009-07-07 15:38:50 +01:00
graham
0cbe8c8466 Fixing snappyHexMesh tut conflict 2009-07-06 14:40:38 +01:00
mattijs
e17c87d876 wildcards for patch spec 2009-07-01 13:54:48 +01:00
mattijs
95dfa44497 missing entry 2009-07-01 13:54:20 +01:00
mattijs
12a924a3f5 no backup of old set 2009-06-30 22:17:20 +01:00
mattijs
1cabcf6c12 createBaffles with faceZone 2009-06-30 22:17:03 +01:00
mattijs
e28256477a checks on zones 2009-06-30 22:16:01 +01:00
graham
f00b156252 Merge branch 'master' into cvm 2009-06-30 11:24:34 +01:00
mattijs
e6416c2604 preserve flipmap 2009-06-29 17:30:02 +01:00
mattijs
74d7cb2664 changed faceZone flip map usage 2009-06-25 23:42:49 +01:00
mattijs
70dfaf6456 moved message printing 2009-06-25 19:34:37 +01:00
mattijs
6c994a32d6 updated example dictionaries for new sources 2009-06-25 17:24:08 +01:00
graham
c6ee712a17 Merge branch 'master' into cvm 2009-06-24 16:00:19 +01:00
mattijs
75945b507f error check for zero cells 2009-06-23 13:16:00 +01:00
graham
4bb9d9c150 Merge branch 'master' into cvm 2009-06-22 16:30:20 +01:00
mattijs
0fd2a5f056 making stitchMesh,mergePatchPairs work 2009-06-18 20:35:55 +01:00
graham
02ddfa98e1 Merging master, fixing conflict in searchableBox.C 2009-06-18 15:26:01 +01:00
graham
cd204331bf Modified copyright years 2009-06-17 14:27:52 +01:00
mattijs
8900641265 not split concave angles by default 2009-06-17 13:37:53 +01:00
mattijs
e92d84b7a9 extrudeMesh improvements 2009-06-16 16:44:35 +01:00
mattijs
3a4cd98671 update face flip map on zone 2009-06-09 14:18:37 +01:00
mattijs
2d9ea72b6a allow -overwrite in snappyHexMesh 2009-06-09 14:02:10 +01:00
mattijs
466b95af86 use extrapolated cell-centre for testing;moved added patch information into meshRefinement class 2009-06-08 18:03:12 +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
8416ec4ebc merging master, fixing conflict in surfaceFeatureExtract. 2009-05-20 18:40:50 +01:00
Mark Olesen
8edf105c45 cleanup of time handling (cosmetic changes), used timeSelector in more places 2009-05-20 15:40:30 +02:00
Mark Olesen
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
graham
428d629d95 Merge branch 'master' into cvm 2009-05-18 11:59:50 +01:00
Mark Olesen
4366d8df2c cosmetics - adjust copyright dates 2009-05-11 15:10:31 +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
mattijs
3d88003e77 order of creation consistent with cyclics 2009-04-30 20:31:13 +01:00
graham
c5ee731267 Conformation to internal and external feature edges. 2009-04-30 20:21:50 +01:00
graham
b487a13281 Added reinsertFeaturePoints and insertVb. Added move() function to be called
from cvMesh at each iteration.

Modified adaptiveLinear to allow relaxation calls to be made nto necessarily
every time step.  Modified sequence of calling of move() and runTime++ in cvMesh
and added a +1 in adaptiveLinear to make the relaxation start at the correct
value and finish on a positive non-zero value.
2009-04-29 14:52:45 +01:00
Mark Olesen
3ce125ff48 minor build fix
- createBaffles used List::append(const T&), changed to DynamicList
2009-04-28 10:18:34 +02:00
graham
ff66dc68d4 Merge branch 'master' into cvm 2009-04-25 13:47:54 +01:00
mattijs
92dbf49ae6 allow multiple coincident baffles 2009-04-24 09:02:03 +01:00
mattijs
d55c97669a directMapped extension for inter-region 2009-04-17 11:00:15 +01:00
mattijs
676b7bfe73 added region option 2009-04-15 12:32:33 +01:00
graham
25f0a4c01d Merge branch 'master' into cvm 2009-04-13 13:11:00 +01:00