Commit Graph

49 Commits

Author SHA1 Message Date
mattijs
e5a635c8b1 Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev 2011-10-28 11:46:45 +01:00
mattijs
ee11f9c0e8 ENH: pointInCell, findCell: switchable in-cell algorithm 2011-10-28 11:33:30 +01:00
laurence
70bc297da5 BUG: cvMesh.C: Remove #include "fvCFD.H". 2011-10-27 09:44:48 +01:00
andy
4f40cdb7d7 GIT: Resolve conflict 2011-08-16 16:09:56 +01:00
Henry
c2dd153a14 Copyright transfered to the OpenFOAM Foundation 2011-08-14 12:17:30 +01:00
mattijs
537c573ff9 COMP: tetCell: namespace error 2011-08-12 17:32:14 +01:00
mattijs
5da4dbe698 ENH: conformalVoronoiMesh: replace fixedlist by tetCell 2011-08-12 09:55:12 +01:00
mattijs
f6cc29b82e STYLE: conformalVoronoiMeshCalcDualMesh: updated message 2011-08-04 16:49:47 +01:00
mattijs
1b26f41bd5 ENH: conformalMeshCalcDualMesh: protect merging processor points 2011-07-28 13:48:12 +01:00
Henry
5f9e3a04f0 cvMesh: Relocated the conformalVoronoiMesh library and localised all uses of CGAL
Removed unused dependencies on CGAL
2011-07-22 14:12:08 +01:00
Henry
3cc1a8f115 conformalVoronoiMesh: Resolve conflict between GPL and QPL 2011-07-22 10:25:25 +01:00
mattijs
68973728a1 ENH: conformalVoronoiMesh: renamed writeTetMesh to writeTetDualMesh 2011-07-19 17:30:25 +01:00
mattijs
006eb30c8a ENH: cvMeshDict: updated comment 2011-07-01 15:10:28 +01:00
mattijs
3732286a69 ENH: added writeTetMesh control to dump tets 2011-06-24 16:16:31 +01:00
mattijs
23f2ee8989 ENH: cvMeshDict: merging close points 2011-06-23 12:19:48 +01:00
mattijs
0520872ce0 ENH: cvMeshDict: updated for removed point seeding method 2011-06-17 17:53:52 +01:00
mattijs
18e043f704 ENH: cvMeshDict: added comments 2011-06-16 19:08:33 +01:00
mattijs
f983ffbdaf ENH: cvMeshDict: added comment 2011-06-16 12:53:13 +01:00
graham
b2d207ce2d ENH: Add basic functionality for better parallel decomp.
BUG: Wrong decision about wellInside.

STYLE: Rename variable - maxLevels to minLevels - better description.

COMP: Add decomp libs.
2011-05-13 10:11:30 +01:00
mattijs
4d52417955 STYLE: cvMesh :date 2011-01-25 19:21:19 +00:00
mattijs
03f7f83560 ENH: cvMesh.C : changed IOdictionary to READ_IF_MODIFIED 2011-01-25 19:17:08 +00:00
graham
89619c5015 Revert "ENH: Copyright dates to allow a push."
This reverts commit c5bea5242b.
2011-01-19 10:26:24 +00:00
graham
c5bea5242b ENH: Copyright dates to allow a push. 2011-01-07 15:09:52 +00:00
graham
a130676ca8 ENH: Not recalculating size and alignment when meshing is over. 2010-09-28 18:56:48 +01:00
graham
d8d8ee60dc ENH: Removing IO from IOdictionaries. 2010-09-28 18:41:47 +01:00
graham
cddce779e8 STYLE: Change to GPL v3 and update copyright date. 2010-04-13 11:38:22 +01:00
graham
378b557cd3 BUG: cellSizeFunction. Bad logic for triggering warning for bothSides
default whern surface does not support volumeType.

BUG: conformalVoronoiMesh.  Making test "totalHits >= hitLimit" rather than
"totalHits = hitLimit" to be strictly consistent and always trigger
the iteration termination message.
2010-02-26 16:11:30 +00:00
graham
cac2640b93 COMP: cvMesh. Removed mpfr and boost lib links - covered by
CGAL_LIBS.
2010-02-23 10:17:03 +00:00
graham
08488007af COMP: CGAL and boost build and environment options. 2010-02-22 16:00:54 +00:00
graham
174cd8e3d7 Adding intertia based collapse axis determination. WIP - some
problems with the tensor::eigenValues calculation:

    "complex eigenvalues detected for tensor:"

for very high aspect ratio faces.
2009-12-22 19:35:03 +00:00
graham
52136b9430 Moving conformalVoronoiMesh into src/mesh folder. 2009-10-21 17:21:06 +01:00
graham
aa94ddf384 Changing boost thread library name, boost 1.40 2009-10-20 11:00:52 +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
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
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
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
cd204331bf Modified copyright years 2009-06-17 14:27:52 +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
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
ce65125574 Surface conformation point pair insertions and polyMesh output (without patching) included. 2009-04-10 17:31:59 +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
graham
fba3c2a732 Added pointFile initialPointsMethod. Lots of tweaks and setting up. 2009-04-06 15:11:54 +01:00
graham
88b7fd4dcb Adding basic functionality from CV3D and creating initialPointsMethod runtime selectable method. 2009-04-03 21:11:54 +01:00
graham
9dbc29742a Basic infrastructure and thinking - designing using the cvMeshDict. 2009-04-02 19:14:44 +01:00
graham
d6854a4507 Rewrite of CV3DMesher to cvMesh. Basic infrastructure and thinking. 2009-04-01 19:16:08 +01:00