Commit Graph

576 Commits

Author SHA1 Message Date
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
andy
dee5c153ca Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-06-11 17:24:51 +01:00
andy
1ebc1c1ad4 Merge branch 'FT' 2009-06-11 17:10:58 +01:00
andy
42c240b97e cosmetics/code-tidying 2009-06-11 17:09:19 +01:00
henry
4c2adfe276 Fixed!!! 2009-06-11 16:18:19 +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
andy
0903bf0b3b removed include file 2009-06-09 13:48:44 +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
andy
279df4d0e6 merge into master 2009-06-05 17:40:08 +01:00
mattijs
918a34dca4 surface redistribution 2009-06-02 17:47:51 +01:00
andy
4e2dbe6598 added option to use time name instead of time index for file names 2009-06-02 10:41:32 +01:00
mattijs
da89474c3b use direct mapping 2009-06-01 13:24:10 +01:00
mattijs
ef5a7f6741 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 15:34:10 +01:00
mattijs
feb846bd43 work around scotch fpe bug 2009-05-29 15:27:55 +01:00
henry
46ca766a4b Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-05-29 09:33:58 +01:00
henry
47beddc1c1 Added output of the patch area magnitude and the integral over the patch area magnitude. 2009-05-29 09:33:47 +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
mattijs
55f5241fc8 output wallDistance 2009-05-28 18:14:38 +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
andy
5969f1629c updates 2009-05-27 19:05:26 +01:00
andy
2a1236c0c2 updates 2009-05-27 16:49:58 +01:00
mattijs
549e72dff2 decomposing meshes in time directories 2009-05-26 21:43:00 +01:00
andy
02b6d0c661 adding new particle tracks app - needs work... 2009-05-22 17:03:49 +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
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
Mark Olesen
4366d8df2c cosmetics - adjust copyright dates 2009-05-11 15:10:31 +02:00
Mark Olesen
0bc18a26f6 bugfix decomposePar
- explicitly remove any previously decomposed 'mut' and 'nut' when
  decomposing fields since they can otherwise prevent the turbulence model
  from being upgraded properly.
  Removing all decomposed fields first might be a better idea in the
  long-term, but would probably be slower.
2009-05-11 10:52:51 +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
mattijs
80d533325a added comment 2009-04-29 11:56:08 +01:00
graham
b7b6dd7d4a Merge branch 'master' into cvm 2009-04-28 14:01:17 +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
mattijs
2d96e32b13 add region option 2009-04-25 14:46:03 +01:00
graham
ff66dc68d4 Merge branch 'master' into cvm 2009-04-25 13:47:54 +01:00
graham
aee81bd45e Added points and edges only constructor for surfaceFeatureConvert 2009-04-24 17:57:18 +01:00
mattijs
b3bf5034af region prefix already in IOobject 2009-04-24 17:01:39 +01:00
mattijs
92dbf49ae6 allow multiple coincident baffles 2009-04-24 09:02:03 +01:00
mattijs
04b82d9231 reconstructing moving mesh cases 2009-04-23 18:30:44 +01:00
mattijs
dd0da3a3f5 new decomposition option 2009-04-23 18:30:26 +01:00
mattijs
371903eb4a Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-04-23 16:22:31 +01:00