Commit Graph

217 Commits

Author SHA1 Message Date
02ddfa98e1 Merging master, fixing conflict in searchableBox.C 2009-06-18 15:26:01 +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
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
466b95af86 use extrapolated cell-centre for testing;moved added patch information into meshRefinement class 2009-06-08 18:03:12 +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
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
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
4366d8df2c cosmetics - adjust copyright dates 2009-05-11 15:10:31 +02:00
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
d781dcf38c Merge branch 'master' into cvm 2009-05-01 10:11:25 +01:00
3d88003e77 order of creation consistent with cyclics 2009-04-30 20:31:13 +01:00
c5ee731267 Conformation to internal and external feature edges. 2009-04-30 20:21:50 +01:00
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
3ce125ff48 minor build fix
- createBaffles used List::append(const T&), changed to DynamicList
2009-04-28 10:18:34 +02:00
ff66dc68d4 Merge branch 'master' into cvm 2009-04-25 13:47:54 +01:00
92dbf49ae6 allow multiple coincident baffles 2009-04-24 09:02:03 +01:00
d55c97669a directMapped extension for inter-region 2009-04-17 11:00:15 +01:00
676b7bfe73 added region option 2009-04-15 12:32:33 +01:00
25f0a4c01d Merge branch 'master' into cvm 2009-04-13 13:11:00 +01:00
ce65125574 Surface conformation point pair insertions and polyMesh output (without patching) included. 2009-04-10 17:31:59 +01:00
52cdb0863a Merge branch 'master' into cvm 2009-04-09 17:24:13 +01:00
c203c3d6fd fixed layer addition iterations 2009-04-09 13:04:23 +01:00
c9e580d266 Ability to fill any initial points properly into any surfaces. Using conformationSurfaces class to handle geometric queries to the surfaces to be conformed to. 2009-04-08 14:56:44 +01:00
51b470c0ee Improved argument handling and error messages.
Changed "axisNormal" to "axis": it isn't the normal to the axis.
2009-04-07 12:52:59 +01:00
fba3c2a732 Added pointFile initialPointsMethod. Lots of tweaks and setting up. 2009-04-06 15:11:54 +01:00
88b7fd4dcb Adding basic functionality from CV3D and creating initialPointsMethod runtime selectable method. 2009-04-03 21:11:54 +01:00
ef1c6a201f Merge branch 'master' into cvm 2009-04-03 18:16:53 +01:00
2e6888a714 write hexRef8 data to correct mesh 2009-04-03 12:29:40 +01:00
9dbc29742a Basic infrastructure and thinking - designing using the cvMeshDict. 2009-04-02 19:14:44 +01:00
bfb8d042fd split of decompositionAgglomeration 2009-04-02 13:29:28 +01:00
d6854a4507 Rewrite of CV3DMesher to cvMesh. Basic infrastructure and thinking. 2009-04-01 19:16:08 +01:00
67f828d299 Changed to gcc 4.3.3, linking mpfr from ThirdParty to CV3DMesher. 2009-03-30 17:00:28 +01:00
6218702064 Merge branch 'master' into cvm 2009-03-30 16:48:32 +01:00
96da5f0e5b sorted zones
modified:   ../applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
	modified:   dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
2009-03-26 12:07:56 +00:00
5af070f914 Merge commit 'OpenCFD/master' into olesenm 2009-03-23 17:22:48 +01:00
be8cbc1018 use timeSelector mechanism in a few more utilities 2009-03-23 16:57:26 +01:00
8ef30f0fb8 use runtime selection mechanism 2009-03-20 18:13:16 +00:00
fd9d0993b9 Modifying boost library include location. Commenting out hacks to allow dangermouse to run. 2009-03-20 13:42:38 +00:00
444ba19c00 Changing to boost 1.38 installed in ThirdParty. Setting template depth to 60, again. 2009-03-18 10:12:37 +00:00
ba05ddc58c Reintroducing CV meshers after removal by a commit in master, originating in the dsmc branch. 2009-03-17 10:13:46 +00:00
0128b2be68 UIndirectList 2009-03-12 19:25:21 +00:00
642dadf1f7 yaw pitch roll 2009-03-12 15:12:31 +00:00
9ec530528f Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-03-10 12:50:34 +00:00
00328814d9 disconnected cell check 2009-03-06 13:34:35 +00:00