Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
502987ac
Commit
502987ac
authored
15 years ago
by
mattijs
Browse files
Options
Downloads
Patches
Plain Diff
BUG:foamExec : save arguments; handle debian naming
parent
d5fc3e24
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
bin/foamExec
+39
-6
39 additions, 6 deletions
bin/foamExec
with
39 additions
and
6 deletions
bin/foamExec
+
39
−
6
View file @
502987ac
...
...
@@ -35,6 +35,10 @@
# mpirun -np <nProcs> \
# foamExec -v <foamVersion> <foamCommand> ... -parallel
#
# Note: - not consistent with foamEtcFiles - does not search 'site'
# directories
# - version switch -v will not work with the debian naming
# openfoamXXX
#------------------------------------------------------------------------------
usage
()
{
while
[
"$#"
-ge
1
]
;
do
echo
"
$1
"
;
shift
;
done
...
...
@@ -54,14 +58,39 @@ USAGE
# This script should exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
# extract the <foamInstall> and <version> elements
# using a function preserves the command args
getDefaults
()
{
set
--
$(
echo
$0
|
sed
-e
's@/OpenFOAM-\([^/]*\)/bin/[^/]*$@ \1@'
)
foamInstall
=
$1
version
=
$2
foamName
=
'OpenFOAM-'
versionFile
=
$2
versionString
=
$2
if
[
-z
"
$versionFile
"
]
then
# Try debian package name
#echo "Assuming debian naming convention 'openfoam<version>'"
set
--
$(
echo
$0
|
sed
-e
's@/openfoam\([0-9]*\)/bin/[^/]*$@ \1@'
)
foamInstall
=
$1
foamName
=
'openfoam'
versionFile
=
$2
versionString
=
$WM_PROJECT_VERSION
#echo "foamInstall=$foamInstall"
#echo "foamName=$foamName"
#echo "versionFile=$versionFile"
#echo "versionString=$versionString"
fi
}
foamInstall
=
''
# path before OpenFOAM-1.7.0
foamName
=
''
# OpenFOAM- or openfoam
versionFile
=
''
# 170 so what the WM_PROJECT_INST_DIR exists as
versionString
=
''
# 1.7.0
# Get above settings from $0
getDefaults
# parse options
...
...
@@ -73,7 +102,8 @@ do
;;
-v
)
shift
version
=
$1
versionString
=
$1
versionFile
=
$1
shift
;;
--
)
...
...
@@ -89,15 +119,18 @@ do
esac
done
#echo "Detected version $versionString with path name $foamName$versionFile"
if
[
"$#"
-lt
1
]
then
usage
"no application specified"
fi
unset
foamDotFile
args
=
"
$*
"
# Check user-specific OpenFOAM bashrc file
foamDotFile
=
"
$HOME
/.OpenFOAM/
$version
/bashrc"
foamDotFile
=
"
$HOME
/.OpenFOAM/
$version
String
/bashrc"
if
[
-f
$foamDotFile
]
then
.
$foamDotFile
...
...
@@ -106,7 +139,7 @@ else
# Use the FOAM_INST_DIR variable for locating the installed version
for
FOAM_INST_DIR
in
$foamInstall
$WM_PROJECT_INST_DIR
do
foamDotFile
=
"
$FOAM_INST_DIR
/
OpenFOAM-
$version
/etc/bashrc"
foamDotFile
=
"
$FOAM_INST_DIR
/
$foamName
$version
File
/etc/bashrc"
if
[
-f
$foamDotFile
]
then
.
$foamDotFile
...
...
@@ -119,11 +152,11 @@ fi
if
[
"
$foamDotFile
"
!=
okay
]
then
echo
"Error : bashrc file could not be found for OpenFOAM-
$version
"
1>&2
echo
"Error : bashrc file could not be found for OpenFOAM-
$version
String
"
1>&2
exit
1
fi
# Pass on the rest of the arguments
exec
$
*
exec
$
args
#------------------------------------------------------------------------------
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment