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
2d5fa6d2e9
Moving edgeMesh compilation after meshTools. Adding conformalVoronoiMesh.
2009-05-24 14:12:08 +01:00
f191a42448
Merge branch 'master' into cvm
2009-05-24 12:07:45 +01:00
88ea18c3a7
change to QMAKE_PATH
2009-05-22 12:32:17 +01:00
71a73d9490
removing duplicate file
2009-05-22 11:57:05 +01:00
cc5506f103
Added backward compatibility in the naming of the ParaView directory.
2009-05-21 18:29:13 +01:00
a562395687
Allow the setting of the Qt version via the path to the appropriate qmake.
2009-05-21 17:45:56 +01:00
10c2f6bee0
Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
2009-05-21 10:13:42 +01:00
8416ec4ebc
merging master, fixing conflict in surfaceFeatureExtract.
2009-05-20 18:40:50 +01:00
a0d9d0690a
Intermediate function for calling edge point group insertion, works out which
...
function to call.
Fixed error in calculating reflMasterPt in insertInternalEdgePointGroup.
Changed from do..while loop to while loop for iterative conformation to allow
the iterative part to be disabled by setting maxIterations = 0.
2009-05-20 18:22:18 +01:00
287fd398e2
adding missed file from tutorial
2009-05-20 17:37:54 +01:00
4459d245b7
updates to bring in to line with radiation lib
2009-05-20 17:31:46 +01:00
69e2eefdb0
added new coalChemisryFoam tutorial
2009-05-20 17:30:21 +01:00
c7ab2fcc4c
changed field name
2009-05-20 16:05:10 +01:00
57bc6a726a
Merge branch 'lagrangianDev' into WBM
2009-05-20 14:58:43 +01:00
a9e1faf9c3
removing const-ness
2009-05-20 14:58:27 +01:00
5866b3a114
correcting signs for return heat of reaction
2009-05-20 14:54:12 +01:00
6ec44522c0
Merge branch 'lagrangianDev' into WBM
2009-05-20 14:50:30 +01:00
0696e9aa44
corrections to chemical enthalpy transfer
2009-05-20 14:50:08 +01:00
8edf105c45
cleanup of time handling (cosmetic changes), used timeSelector in more places
2009-05-20 15:40:30 +02:00
7941b04785
Merge commit 'OpenCFD/master' into olesenm
2009-05-19 21:15:56 +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
c8aa86841c
Added findEdgeNearestByType functions to allow simultaneous identification of
...
nearby pairs of edges of different type.
2009-05-19 19:20:30 +01:00
174efa305c
Merge branch 'lagrangianDev' into WBM
2009-05-19 18:27:02 +01:00
5ccff5ffca
updated version in header to 1.5.x
2009-05-19 18:23:41 +01:00
58871d4368
adding writeRegisteredObject
2009-05-19 18:18:56 +01:00
30baccd509
adding reactingParcelFoam tutorial
2009-05-19 17:54:45 +01:00
4fa5f74f8a
using null constructor for none option
2009-05-19 17:37:41 +01:00
c4ac52e6b0
fix: taking carrier specie id
2009-05-19 17:37:04 +01:00
724b034cc7
argList enhancement: added convenience methods for accessing options
...
Oriented somewhat on dictionary methods.
Return the argument string associated with the named option:
Info<< "-foo: " << args.option("foo") << nl;
Return true if the named option is found
if (args.optionFound("foo")) ...
Return an IStringStream to the named option
old: value = readScalar(IStringStream(args.options()["foo"])());
newer: value = readScalar(args.optionLookup("foo")());
also: List<scalar> lst(args.optionLookup("foo")());
Read a value from the named option
newest: value = args.optionRead<scalar>("foo");
Read a value from the named option if present.
old: if (args.options().found("foo"))
{
value = readScalar(IStringStream(args.options()["foo"])());
}
new: args.optionReadIfPresent("foo", value);
Read a List of values from the named option
patches = args.optionReadList<word>("patches");
Didn't bother adding optionReadListIfPresent<T>(const word&), since it
probably wouldn't be common anyhow.
2009-05-19 18:19:49 +02:00
55e766bd67
Fix: edge lookup from edgeLabels_ by index rather than just from edges
2009-05-19 15:48:54 +01:00
63daefa829
Fix: edge lookup from edgeLabels_ by index rather than just from edges
2009-05-19 15:48:54 +01:00
3efc299dea
multiple updates
2009-05-19 15:06:43 +01:00
bbb9e52353
updates to surface reaction models
2009-05-19 15:05:18 +01:00
5dbc2e53c1
moved h-eqn out of PISO loop
2009-05-19 15:03:39 +01:00
04064d110b
fixed: wrong calculation of H1
2009-05-19 15:03:00 +01:00
1d2a94c38b
HashTable minor iterator issues
...
- made const_iterator::operator* and const_iterator::operator() const only
- added const versions of iterator::operator* and iterator::operator()
2009-05-19 13:14:54 +02:00
ef1f480257
adding path to meshTools/lnInclude
2009-05-19 10:02:53 +01:00
de937e59d1
typo - missing ()'s
2009-05-18 19:36:31 +01:00
e28e356487
Removing unnecessary lines of asterisks
2009-05-18 19:15:13 +01:00
a723b85abd
updates to enable requested field activated injection
2009-05-18 19:04:04 +01:00
f2f7b74f03
added pre-factor for reference field
2009-05-18 19:02:16 +01:00
6f68f6fb20
typo - missing ()'s
2009-05-18 19:36:31 +01:00
868e2e4096
adding path to meshTools/lnInclude
2009-05-19 10:02:53 +01:00
2ca4831e61
multiple updates
2009-05-19 15:06:43 +01:00
8883e2b87e
fixed: wrong calculation of H1
2009-05-19 15:03:00 +01:00
98fc11e827
added pre-factor for reference field
2009-05-18 19:02:16 +01:00
2f5178f60c
updates
2009-05-18 18:05:17 +01:00
13a61cb519
Merge branch 'lagrangianDev' into WBM
2009-05-18 17:13:47 +01:00
