Commit Graph

115 Commits

Author SHA1 Message Date
graham
b31dc84dba Merge branch 'master' into cvm 2009-08-11 11:21:23 +01:00
henry
31c76da40f Changed the runtime-selection tables to output a sorted toc. 2009-08-06 18:01:28 +01:00
graham
5c28dd80cd Added control for surface conformation rebuild frequency.
Adding execution time to application.

Adding boolean control for timeChecks, setting to off.

Added determination and reporting of the net number of vertices removed during
an iteration.

Modified and cleaned up all reporting to screen.
2009-08-06 16:39:48 +01:00
graham
0b990fd925 Tweak to commented out function. 2009-08-05 18:20:24 +01:00
graham
20407ca628 Moved vertex size and alignment setting to an external function. Still needs to
have a stored point rebuild mechanism.

Added functions to decide when and how to rebuild and store the surface
conformation.  conformToSurface is now private, so only move can be called from
outside the conformalVoronoiMesh class.
2009-08-05 15:27:06 +01:00
graham
97900b0ba4 Using a remove and insert method to move points to avoid problems with the CGAL
move function.  If move can't be fixed by the CGAL guys then go to a complete
removal and reinsertion at each step.
2009-08-05 13:25:00 +01:00
graham
e82106c619 Storing and reinserting surface conformation instead of recalculating at each
iteration. Rebuilding every 10 steps as a hard-coded experiment.
2009-08-04 18:26:55 +01:00
mattijs
fe0745476d revert to reading surfaces from constant so parallel works out of the box 2009-08-04 16:43:38 +01:00
graham
fdcc01b2e3 Linear surface distance cell size function 2009-08-03 15:06:26 +01:00
graham
8d9063f8e5 Modified size function - function of distance to surface. 2009-07-31 17:53:50 +01:00
graham
851639c0f5 Added rotational face controller to CV2DMesher. Works well, converges in <80
iterations as with 3D.  Size function and controller parameters hard coded.

Produces seg faults from CGAL intermittently on point insertions, whether the
exact or inexact kernel is used, in FULLDEBUG or NDEBUG builds.  Submitted query
to cgal mailing list.
2009-07-31 16:48:19 +01:00
graham
2d2c8cf8bc Merge branch 'master' into cvm 2009-07-28 10:40:50 +01:00
henry
816f6b3488 Updated the headers. 2009-07-24 17:01:31 +01:00
andy
c1993c92fa Merge branch 'olesenm' 2009-07-23 12:42:52 +01:00
Chris Greenshields
1bfa912781 Modified more Description entries in utilities for documenting purposes 2009-07-22 15:51:53 +01:00
Mark Olesen
dacc93a568 Merge commit 'OpenCFD/master' into olesenm 2009-07-22 12:55:38 +02:00
Mark Olesen
5692a06a32 fixed up sloppy Allwclean files 2009-07-22 12:39:20 +02:00
mattijs
e3710c2b66 stabilise expansion calculation for if no point on arc 2009-07-22 11:24:03 +01:00
graham
1f8e1a0a58 Added objOutput Switch to controls to allow debug obj output to be controlled.
Added function to limit vertex displacements that penetrate the surface or come
to close to it (closer than twice the local point pair distance) by recursively
halving the displacement vector.

Using runTime.loop() construct in app for time loop - with runTime++ at the end
of the loop - wasn't getting the polyMesh written to the final timestep.  Moving
targetCellSize and internal delaunay vertex writing out of writeDual function
and calling them from the move() function.
2009-07-14 15:34:30 +01:00
graham
6cf07c4cb8 Implemented face rotation controller and some associated functions and fixes.
Some test code code commented out at point of displacementAccumulator
addition/clip.
2009-07-13 18:24:21 +01:00
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
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
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
95dfa44497 missing entry 2009-07-01 13:54:20 +01:00
graham
f00b156252 Merge branch 'master' into cvm 2009-06-30 11:24:34 +01:00
mattijs
70dfaf6456 moved message printing 2009-06-25 19:34:37 +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
e92d84b7a9 extrudeMesh improvements 2009-06-16 16:44:35 +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
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
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
graham
25f0a4c01d Merge branch 'master' into cvm 2009-04-13 13:11:00 +01:00
graham
ce65125574 Surface conformation point pair insertions and polyMesh output (without patching) included. 2009-04-10 17:31:59 +01:00
graham
52cdb0863a Merge branch 'master' into cvm 2009-04-09 17:24:13 +01:00
mattijs
c203c3d6fd fixed layer addition iterations 2009-04-09 13:04:23 +01:00
graham
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