zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2014-01-28 13:08:11 +00:00
parent 70f27712ae 7f5aa93279
commit dab71c5510
20 changed files with 161 additions and 50332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/Allwmake
View File

@ -7,7 +7,7 @@ wmake all extrude
wmake all extrude2DMesh
wmake all snappyHexMesh
if [ -d "$CGAL_ARCH_PATH" ]
if [ -n "$CGAL_ARCH_PATH" ]
then
wmake libso foamyHexMesh/conformalVoronoiMesh
wmake all foamyHexMesh

2
applications/utilities/mesh/generation/foamyHexMesh/Allwmake
View File

@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
if [ -d "$CGAL_ARCH_PATH" ]
if [ -n "$CGAL_ARCH_PATH" ]
then
wmake libso conformalVoronoiMesh
wmake

2
applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
View File

@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
if [ -d "$CGAL_ARCH_PATH" ]
if [ -n "$CGAL_ARCH_PATH" ]
then
#- Already built by ../Allwake
#wmake libso ../foamyHexMesh/conformalVoronoiMesh

6
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,8 +55,8 @@ Usage
\param -fields \n
Use existing geometry decomposition and convert fields only.
\param -sets \n
Decompose cellSets, faceSets, pointSets.
\param -noSets \n
Skip decomposing cellSets, faceSets, pointSets.
\param -force \n
Remove any existing \a processor subdirectories before decomposing the

1
applications/utilities/preProcessing/mapFields/Make/options
View File

@ -1,5 +1,4 @@
EXE_INC = \
-DFULLDEBUG -g -O0 \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \

2
bin/tools/foamLog.db
View File

@ -51,3 +51,5 @@ epsAvg/bounding epsilon,/average:
alpha1Min/Min\(alpha1\) =/Min(alpha1) =
alpha1Max/Max\(alpha1\) =/Max(alpha1) =
# AMI
AMIMin/AMI: Patch source sum/average =

1
etc/bashrc
View File

@ -214,6 +214,7 @@ _foamSource $WM_PROJECT_DIR/etc/config/aliases.sh
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.sh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/gperftools.sh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/CGAL.sh`
# Clean environment paths again. Only remove duplicates

50
etc/config/CGAL.csh Normal file
View File

@ -0,0 +1,50 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/CGAL.csh
#
# Description
# Setup file for CGAL (& boost) include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
##------------------------------------------------------------------------------
set boost_version=boost-system
set cgal_version=CGAL-4.3
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using CGAL and boost"
echo " $cgal_version at $CGAL_ARCH_PATH"
echo " $boost_version at $BOOST_ARCH_PATH"
endif
if ( -d "$BOOST_ARCH_PATH" ) then
_foamAddLib $BOOST_ARCH_PATH/lib
endif
unset boost_version cgal_version
# -----------------------------------------------------------------------------

52
etc/config/CGAL.sh Normal file
View File

@ -0,0 +1,52 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/CGAL.sh
#
# Description
# Setup file for CGAL (& boost) include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#------------------------------------------------------------------------------
boost_version=boost-system
cgal_version=CGAL-4.3
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using CGAL and boost"
echo " $cgal_version at $CGAL_ARCH_PATH"
echo " $boost_version at $BOOST_ARCH_PATH"
fi
if [ -d "$BOOST_ARCH_PATH" ]
then
_foamAddLib $BOOST_ARCH_PATH/lib
fi
unset boost_version cgal_version
# -----------------------------------------------------------------------------

29
etc/config/settings.csh
View File

@ -353,35 +353,6 @@ if ( $?WM_CXXFLAGS ) then
endif
# boost and CGAL
# ~~~~~~~~~~~~~~
set boost_version=boost_1_45_0
set cgal_version=CGAL-4.0
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
# enabled if CGAL is available
if ($?FOAM_VERBOSE && $?prompt) then
echo "Checking for"
echo " $cgal_version at $CGAL_ARCH_PATH"
echo " $boost_version at $BOOST_ARCH_PATH"
endif
if ( -d "$CGAL_ARCH_PATH" ) then
if ( -d "$BOOST_ARCH_PATH" ) then
_foamAddLib $BOOST_ARCH_PATH/lib
else
unsetenv BOOST_ARCH_PATH
endif
_foamAddLib $CGAL_ARCH_PATH/lib
else
unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
endif
unset boost_version cgal_version
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~

34
etc/config/settings.sh
View File

@ -370,40 +370,6 @@ then
fi
# boost and CGAL
# ~~~~~~~~~~~~~~
boost_version=boost_1_45_0
cgal_version=CGAL-4.0
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
# enabled if CGAL is available
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Checking for"
echo " $cgal_version at $CGAL_ARCH_PATH"
echo " $boost_version at $BOOST_ARCH_PATH"
fi
if [ -d "$CGAL_ARCH_PATH" ]
then
if [ -d "$BOOST_ARCH_PATH" ]
then
_foamAddLib $BOOST_ARCH_PATH/lib
_foamAddLib $BOOST_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
else
unset BOOST_ARCH_PATH
fi
_foamAddLib $CGAL_ARCH_PATH/lib
_foamAddLib $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
else
unset BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH GMP_ARCH_PATH
fi
unset boost_version cgal_version
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~

1
etc/cshrc
View File

@ -203,6 +203,7 @@ _foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.csh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh`
_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/CGAL.csh`
# Clean environment paths again. Only remove duplicates

16
tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
View File

@ -23,28 +23,12 @@ geometry
{
name sphere;
type triSurfaceMesh;
regions
{
ascii
{
name sphere_patch;
}
}
}
cone_orient.stl
{
name cone;
type triSurfaceMesh;
regions
{
ascii
{
name cone_patch;
}
}
}
// Outside of domain

10
tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/T
View File

@ -20,28 +20,28 @@ internalField uniform 1;
boundaryField
{
box_inlet
inlet
{
type fixedValue;
value uniform 1;
}
box_outlet
outlet
{
type zeroGradient;
}
box_bottom
bottom
{
type zeroGradient;
}
box_top
top
{
type zeroGradient;
}
letters_text
letters
{
type zeroGradient;
}

10
tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/U
View File

@ -20,18 +20,18 @@ internalField uniform (0 0 0);
boundaryField
{
box_inlet
inlet
{
type fixedValue;
value uniform (3 0 0);
}
box_outlet
outlet
{
type zeroGradient;
}
box_bottom
bottom
{
type supersonicFreestream;
UInf (3 0 0);
@ -40,7 +40,7 @@ boundaryField
gamma 1.4;
}
box_top
top
{
type supersonicFreestream;
UInf (3 0 0);
@ -49,7 +49,7 @@ boundaryField
gamma 1.4;
}
letters_text
letters
{
type fixedValue;
value uniform (0 0 0);

10
tutorials/mesh/foamyQuadMesh/OpenCFD/0.org/p
View File

@ -20,28 +20,28 @@ internalField uniform 1;
boundaryField
{
box_inlet
inlet
{
type fixedValue;
value uniform 1;
}
box_outlet
outlet
{
type zeroGradient;
}
box_bottom
bottom
{
type zeroGradient;
}
box_top
top
{
type zeroGradient;
}
letters_text
letters
{
type zeroGradient;
}

28
tutorials/mesh/foamyQuadMesh/OpenCFD/system/foamyQuadMeshDict
View File

@ -27,6 +27,34 @@ geometry
{
name box;
type closedTriSurfaceMesh;
regions
{
back
{
name back;
}
front
{
name front;
}
bottom
{
name bottom;
}
top
{
name top;
}
inlet
{
name inlet;
}
outlet
{
name outlet;
}
}
}
}

10
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/polyMesh/boundary
View File

@ -20,21 +20,21 @@ FoamFile
inlet
{
type patch;
nFaces 0;
nFaces 652;
startFace 1576984;
}
outlet
{
type patch;
nFaces 0;
startFace 1576984;
nFaces 112;
startFace 1577636;
}
outerCylinder
{
type wall;
inGroups 1(wall);
nFaces 1404;
startFace 1576984;
nFaces 640;
startFace 1577748;
}
propellerTip
{

50225
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/constant/triSurface/propellerTip.obj
View File

File diff suppressed because it is too large Load Diff

2
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
View File

@ -64,7 +64,7 @@ geometry
}
}
}
propellerTip.obj
propellerTip.obj.gz
{
type triSurfaceMesh;
name propellerTip;