Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
685a578b
Commit
685a578b
authored
May 26, 2011
by
sergio
Browse files
Merge branch 'master' of
ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
parents
a6bc768a
1432a89c
Changes
40
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
685a578b
...
...
@@ -60,8 +60,8 @@ doc/[Dd]oxygen/man
# untracked configuration files
/etc/prefs.csh
/etc/prefs.sh
/etc/config/
*
.csh
/etc/config/
*
.sh
/etc/config/
prefs
.csh
/etc/config/
prefs
.sh
# source packages - anywhere
*.tar.bz2
...
...
ReleaseNotes-dev
View file @
685a578b
...
...
@@ -241,9 +241,11 @@
- works in parallel
+ =snappyHexMesh=:
+ extrude across multi-processor boundaries
+ preserve faceZones during layering
+ combining
patch faces
after snapping
+ preserve faceZones
shape
during layering
+ combining
coincident patch faces is now default
after snapping
+ *Warning*:
- snapControls::tolerance setting fixed w.r.t. 17x. Is the
multiplication to calculate the local search distance for nearest.
- minMedianAxisAngle angle fixed w.r.t. 17x. Set to
90 to get same behaviour as 130 in 17x.
- nGrow did not work in 17x. Set to 0
...
...
@@ -308,6 +310,8 @@
+ multipleBoxes, hotBoxes, panel, evaporationTest
+ =interDyMFoam= tutorials:
+ testTubeMixer: showcases =solidBodyMotionFunction=
+ =snappyHexMesh= tutorials:
+ flange: demonstration of feature lines in snappyHexMesh
* Other
+ compilable with =clang=
...
...
applications/solvers/basic/potentialFoam/potentialFoam.C
View file @
685a578b
...
...
@@ -49,6 +49,10 @@ int main(int argc, char *argv[])
Info
<<
nl
<<
"Calculating potential flow"
<<
endl
;
// Since solver contains no time loop it would never execute
// function objects so do it ourselves.
runTime
.
functionObjects
().
start
();
adjustPhi
(
phi
,
U
,
p
);
for
(
int
nonOrth
=
0
;
nonOrth
<=
nNonOrthCorr
;
nonOrth
++
)
...
...
@@ -99,6 +103,9 @@ int main(int argc, char *argv[])
p
.
write
();
}
runTime
.
functionObjects
().
end
();
Info
<<
"ExecutionTime = "
<<
runTime
.
elapsedCpuTime
()
<<
" s"
<<
" ClockTime = "
<<
runTime
.
elapsedClockTime
()
<<
" s"
<<
nl
<<
endl
;
...
...
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
View file @
685a578b
...
...
@@ -220,7 +220,7 @@ snapControls
//- Maximum relative distance for points to be attracted by surface.
// True distance is this factor times local maximum edge length.
// Note: changed(corrected) w.r.t 17x! (17x used 2* tolerance)
tolerance
2
.0;
tolerance
1
.0;
//- Number of mesh displacement relaxation iterations.
nSolveIter 30;
...
...
@@ -228,6 +228,10 @@ snapControls
//- Maximum number of snapping relaxation iterations. Should stop
// before upon reaching a correct mesh.
nRelaxIter 5;
//- Highly experimental and wip: number of feature edge snapping
// iterations. Leave out altogether to disable.
//nFeatureSnapIter 10;
}
...
...
@@ -258,6 +262,9 @@ addLayersControls
//- Wanted thickness of final added cell layer. If multiple layers
// is the
// thickness of the layer furthest away from the wall.
// Relative to undistorted size of cell outside layer.
// is the thickness of the layer furthest away from the wall.
// See relativeSizes parameter.
finalLayerThickness 0.3;
...
...
@@ -410,7 +417,7 @@ debug 0;
// Merge tolerance. Is fraction of overall bounding box of initial mesh.
// Note: the write tolerance needs to be higher than this.
mergeTolerance 1
E
-6;
mergeTolerance 1
e
-6;
// ************************************************************************* //
bin/tools/foamConfigurePaths
View file @
685a578b
...
...
@@ -131,7 +131,7 @@ do
paraviewInstall
=
"
$2
"
# replace ParaView_DIR=...
_inlineSed
\
etc/
apps
/paraview
3/bashrc
\
etc/
config
/paraview
.sh
\
'/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='
"
$paraviewInstall
@"
\
"Replacing ParaView_DIR setting by '
$paraviewInstall
'"
shift
2
...
...
etc/bashrc
View file @
685a578b
...
...
@@ -177,7 +177,7 @@ _foamEval()
_foamSource
`
$WM_PROJECT_DIR
/bin/foamEtcFile prefs.sh
`
# Evaluate command-line parameters and record settings for later
# these can be used to set/unset values, or specify pref
s
files
# these can be used to set/unset values, or specify
alternative
pref files
export
FOAM_SETTINGS
=
"
$@
"
_foamEval
$@
...
...
@@ -201,13 +201,13 @@ export PATH LD_LIBRARY_PATH MANPATH
# Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource
$WM_PROJECT_DIR
/etc/settings.sh
_foamSource
$WM_PROJECT_DIR
/etc/aliases.sh
_foamSource
$WM_PROJECT_DIR
/etc/
config/
aliases.sh
# Source user setup files for optional packages
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource
`
$WM_PROJECT_DIR
/bin/foamEtcFile
apps
/paraview
3/bashrc
`
_foamSource
`
$WM_PROJECT_DIR
/bin/foamEtcFile
apps
/ensight
/bashrc
`
_foamSource
`
$WM_PROJECT_DIR
/bin/foamEtcFile
config
/paraview
.sh
`
_foamSource
`
$WM_PROJECT_DIR
/bin/foamEtcFile
config
/ensight
.sh
`
# Clean environment paths again. Only remove duplicates
...
...
etc/config/README
0 → 100644
View file @
685a578b
The main OpenFOAM settings are located in the parent etc/ directory
* bashrc, cshrc
entry point for sourcing
* settings.csh, settings.sh
core settings
* prefs.csh, prefs.sh
these files are untracked and can be used for some site-defined
settings
The etc/config/ directory contains various configuration files in
sh/csh variants:
* aliases.csh, aliases.sh
aliases for interactive shells
* unset.csh, unset.sh
sourced to clear as many OpenFOAM environment settings as possible
* ensight.csh, ensight.sh
application settings for EnSight
* paraview.csh, paraview.sh
application settings for ParaView
* scotch.sh
application settings for compiling against scotch
---
The config/example directory contains various example configuration files
in sh/csh variants
* compiler.csh, compiler.sh
an example of fine tuning ThirdParty compiler settings for OpenFOAM
* openmpi.csh, openmpi.sh
an example of fine tuning openmpi settings for OpenFOAM
* paraview.csh, paraview.sh
an example of chaining to the standard config/paraview.sh with a
different ParaView_VERSION
* prefs.csh, prefs.sh
an example of supplying alternative site-defined settings
---
etc/aliases.csh
→
etc/
config/
aliases.csh
View file @
685a578b
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# etc/aliases.csh
# etc/
config/
aliases.csh
#
# Description
# Aliases for working with OpenFOAM
...
...
@@ -39,7 +39,7 @@ alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
alias
wmDP
'wmSET WM_PRECISION_OPTION=DP'
# clear env
alias
wmUNSET
=
'source $WM_PROJECT_DIR/etc/unset.csh'
alias
wmUNSET
=
'source $WM_PROJECT_DIR/etc/
config/
unset.csh'
# Toggle wmakeScheduler on/off
# - also need to set WM_HOSTS
...
...
@@ -49,7 +49,7 @@ alias wmSchedOFF 'unsetenv WM_SCHEDULER'
# Change ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~
alias
foamPV
'source `$WM_PROJECT_DIR/etc/
apps
/paraview
3/
csh
rc
` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
alias
foamPV
'source `$WM_PROJECT_DIR/etc/
config
/paraview
.
csh` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION'
# Change directory aliases
...
...
etc/aliases.sh
→
etc/
config/
aliases.sh
View file @
685a578b
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# etc/aliases.sh
# etc/
config/
aliases.sh
#
# Description
# Aliases for working with OpenFOAM
...
...
@@ -39,7 +39,7 @@ alias wmSP='wmSET WM_PRECISION_OPTION=SP'
alias
wmDP
=
'wmSET WM_PRECISION_OPTION=DP'
# clear env
alias
wmUNSET
=
'. $WM_PROJECT_DIR/etc/unset.sh'
alias
wmUNSET
=
'. $WM_PROJECT_DIR/etc/
config/
unset.sh'
# Toggle wmakeScheduler on/off
# - also need to set WM_HOSTS
...
...
@@ -52,7 +52,7 @@ alias wmSchedOFF='unset WM_SCHEDULER'
unset
foamPV
foamPV
()
{
.
$WM_PROJECT_DIR
/etc/
apps
/paraview
3/bashrc
ParaView_VERSION
=
$1
.
$WM_PROJECT_DIR
/etc/
config
/paraview
.sh
ParaView_VERSION
=
$1
echo
"paraview-
$ParaView_VERSION
(major:
$ParaView_MAJOR
)"
}
...
...
etc/
apps
/ensight
/
csh
rc
→
etc/
config
/ensight
.
csh
View file @
685a578b
...
...
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# ensight
/
csh
rc
#
config/
ensight
.
csh
#
# Description
# Setup file for Ensight
...
...
etc/
apps
/ensight
/bashrc
→
etc/
config
/ensight
.sh
View file @
685a578b
...
...
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2004-201
0
OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2004-201
1
OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
#
ensight/bashrc
#
config/ensight.sh
#
# Description
# Setup file for Ensight
...
...
etc/config/compiler.csh
-EXAMPLE
→
etc/config/
example/
compiler.csh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/compiler.csh
# config/
example/
compiler.csh
#
# Description
#
F
ine tuning
of
ThirdParty compiler settings for OpenFOAM
#
Example of f
ine tuning ThirdParty compiler settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
#
#------------------------------------------------------------------------------
...
...
etc/config/compiler.sh
-EXAMPLE
→
etc/config/
example/
compiler.sh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/compiler.sh
# config/
example/
compiler.sh
#
# Description
#
F
ine tuning
of
ThirdParty compiler settings for OpenFOAM
#
Example of f
ine tuning ThirdParty compiler settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
#
#------------------------------------------------------------------------------
...
...
etc/config/openmpi.csh
-EXAMPLE
→
etc/config/
example/
openmpi.csh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/openmpi.csh
# config/
example/
openmpi.csh
#
# Description
#
F
ine tuning
of
openmpi settings for OpenFOAM
#
Example of f
ine tuning openmpi settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
#
#------------------------------------------------------------------------------
...
...
etc/config/openmpi.sh
-EXAMPLE
→
etc/config/
example/
openmpi.sh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# config/openmpi.sh
# config/
example/
openmpi.sh
#
# Description
#
F
ine tuning
of
openmpi settings for OpenFOAM
#
Example of f
ine tuning openmpi settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
#
#------------------------------------------------------------------------------
...
...
etc/
apps
/paraview
3/
csh
rc-EXAMPLE
→
etc/
config/example
/paraview
.
csh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# paraview
3/
csh
rc-EXAMPLE
#
config/example/
paraview
.
csh
#
# Description
# Example of chaining to the standard paraview
3/
csh
rc
with a
# Example of chaining to the standard
config/
paraview
.
csh with a
# different ParaView_VERSION
#
# Note
...
...
@@ -35,10 +35,10 @@
#------------------------------------------------------------------------------
#
# Use other (shipped) csh
rc
with a different ParaView_VERSION
# Use other (shipped)
paraview.
csh with a different ParaView_VERSION
#
set
foamFile
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile
-mode
o
apps
/paraview
3/
csh
rc
`
set
foamFile
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile
-mode
o
config
/paraview
.
csh
`
if
(
$status
==
0
)
source
$foamFile
ParaView_VERSION
=
3.9.0
unset
foamFile
...
...
etc/
apps/paraview3/bashrc-EXAMPLE
→
etc/
config/example/paraview.sh
View file @
685a578b
...
...
@@ -22,10 +22,10 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
#
paraview3/bashrc-EXAMPLE
#
config/example/paraview.sh
#
# Description
# Example of chaining to the standard paraview
3/bashrc
with a
# Example of chaining to the standard
config/
paraview
.sh
with a
# different ParaView_VERSION
#
# Note
...
...
@@ -35,10 +35,10 @@
#------------------------------------------------------------------------------
#
# Use other (shipped)
bashrc
with a different ParaView_VERSION
# Use other (shipped)
paraview.sh
with a different ParaView_VERSION
#
foamFile
=
$(
$WM_PROJECT_DIR
/bin/foamEtcFile
-mode
o
apps
/paraview
3/bashrc
2>/dev/null
)
foamFile
=
$(
$WM_PROJECT_DIR
/bin/foamEtcFile
-mode
o
config
/paraview
.sh
2>/dev/null
)
[
$?
-eq
0
]
&&
.
$foamFile
ParaView_VERSION
=
3.9.0
unset
foamFile
...
...
etc/prefs.csh
-EXAMPLE
→
etc/
config/example/
prefs.csh
View file @
685a578b
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
#
etc
/prefs.csh
#
config/example
/prefs.csh
#
# Description
# Preset variables for the OpenFOAM configuration - C-Shell shell syntax.
...
...
etc/prefs.sh
-EXAMPLE
→
etc/
config/example/
prefs.sh
View file @
685a578b
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
#
etc
/prefs.sh
#
config/example
/prefs.sh
#
# Description
# Preset variables for the OpenFOAM configuration - POSIX shell syntax.
...
...
etc/
apps
/paraview
3/
csh
rc
→
etc/
config
/paraview
.
csh
View file @
685a578b
...
...
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
# paraview
3/
csh
rc
#
config/
paraview
.
csh
#
# Description
# Setup file for paraview-3.x
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment