songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,070 Commits 104 Branches 33 Tags 325 MiB
02ddfa98e1
Commit Graph

81 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
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
henry
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
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
ef1c6a201f Merge branch 'master' into cvm 2009-04-03 18:16:53 +01:00
graham
9dbc29742a Basic infrastructure and thinking - designing using the cvMeshDict. 2009-04-02 19:14:44 +01:00
mattijs
bfb8d042fd split of decompositionAgglomeration 2009-04-02 13:29:28 +01:00
graham
d6854a4507 Rewrite of CV3DMesher to cvMesh. Basic infrastructure and thinking. 2009-04-01 19:16:08 +01:00
graham
67f828d299 Changed to gcc 4.3.3, linking mpfr from ThirdParty to CV3DMesher. 2009-03-30 17:00:28 +01:00
graham
6218702064 Merge branch 'master' into cvm 2009-03-30 16:48:32 +01:00
mattijs
8ef30f0fb8 use runtime selection mechanism 2009-03-20 18:13:16 +00:00
Graham
fd9d0993b9 Modifying boost library include location. Commenting out hacks to allow dangermouse to run. 2009-03-20 13:42:38 +00:00
Graham
444ba19c00 Changing to boost 1.38 installed in ThirdParty. Setting template depth to 60, again. 2009-03-18 10:12:37 +00:00
Graham
ba05ddc58c Reintroducing CV meshers after removal by a commit in master, originating in the dsmc branch. 2009-03-17 10:13:46 +00:00
mattijs
9ec530528f Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-03-10 12:50:34 +00:00
mattijs
11d9c0f279 rename snappy parameter 2009-03-05 17:01:31 +00:00
mattijs
aa7be71de3 problem cell deletion 2009-03-05 13:11:28 +00:00
Mark Olesen
507ad1e643 Merge commit 'OpenCFD/master' into olesenm 2009-02-25 10:50:26 +01:00
mattijs
af8a42067c collapse cell detection 2009-02-24 12:05:35 +00:00
Mark Olesen
4b60453cf1 use while (runTime.loop() { .. } where possible in solvers 
- change system/controlDict to use functions {..} instead of functions (..);
  * This is internally more efficient
- fixed formatting of system/controlDict functions entry

- pedantic change: use 'return 0' instead of 'return(0)' in the applications,
  since return is a C/C++ keyword, not a function.
 2009-02-18 08:57:10 +01:00
Mark Olesen
844211a940 Merge commit 'OpenCFD/master' into olesenm 2009-02-06 21:19:42 +01:00
mattijs
9b0bebec00 making overwrite work 2009-02-06 15:12:24 +00:00
Mark Olesen
ffd9bb08a8 OSspecific: altered file tests 
- removed the previously added fileName type(), isDir(), isFile() methods.

- added optional bool parameter to isFile() function to explicitly
  enable/disable the check for gzip files.

- fixed minor bugginess where the default usage of isFile() would result in
  false positive matches.

- be slightly more stringent and use isDir() and isFile() instead of
  exists() function when we actually know the expected type.
 2009-02-06 10:25:41 +01:00
mattijs
206caf4ccb Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-01-30 14:45:10 +00:00
mattijs
5ec940465b missing link libraries 2009-01-30 14:44:44 +00:00
Mark Olesen
c048dd88c7 use new IOobject constructor: blockMesh, surfaceCoordinateSystemTransform(beta) 2009-01-27 15:12:19 +01:00
Mark Olesen
95dcb6ded7 Simplify checking of container (List/HashTable, strings) sizes 
- can use 'XX.empty()' instead of 'XX.size() == 0', 'XX.size() < 1' or
  'XX.size() <= 0' or for simpler coding.
  It also has the same number of characters as '!XX.size()' and /might/ be
  more readable

- many size checking had 'XX.size() > 0', 'XX.size() != 0', or 'XX.size() >= 1'
  when a simple 'XX.size()' suffices
 2009-01-10 20:28:06 +01:00
Mark Olesen
19503c93e1 rename xfer<T> class to Xfer<T> 
- The capitalization is consistent with most other template classes, but
  more importantly frees up xfer() for use as method name without needing
  special treatment to avoid ambiguities.

  It seems reasonable to have different names for transfer(...) and xfer()
  methods, since the transfer is occuring in different directions.
  The xfer() method can thus replace the recently introduced zero-parameter
  transfer() methods.
  Other name candidates (eg, yield, release, etc.) were deemed too abstract.
 2009-01-05 12:30:19 +01:00
Mark Olesen
973b9ea0ce boundBox, octree cleanup 
- added boundBox(const tmp<pointField>&) constructor for use with
    coordinate systems
  - moved some methods from treeBoundBox to boundBox and use VectorSpace ops
 2009-01-01 17:03:19 +01:00
Mark Olesen
28b200bcd9 update copyrights for 2009 2008-12-31 19:01:56 +01:00
Mark Olesen
dcc82bf77b boundingBox has mag() and span() methods - use them 2008-12-31 17:58:23 +01:00
mattijs
ffa75238a6 comment 2008-12-11 15:49:29 +00:00
Mark Olesen
345df1e970 Merge commit 'OpenCFD/master' into olesenm 2008-11-05 10:42:05 +01:00
Mark Olesen
9a4de95354 made xfer constructors explicit, with trickle down to polyMesh/fvMesh calls 2008-10-27 13:14:07 +01:00
Mark Olesen
4c3c2385ed blockMesh tweaks 
- convertToMeters optional, also allow 'scale'
 2008-10-25 17:55:56 +02:00