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
f9d61d7e
Commit
f9d61d7e
authored
Feb 10, 2016
by
Henry Weller
Browse files
Updates for changes to etc/config structure
parent
bbcfb509
Changes
7
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
f9d61d7e
...
...
@@ -58,8 +58,8 @@ doc/Doxygen/DTAGS
# Untracked configuration files
/etc/prefs.csh
/etc/prefs.sh
/etc/config/prefs.csh
/etc/config/prefs.sh
/etc/config
.csh
/prefs.csh
/etc/config
.sh
/prefs.sh
# Source packages - anywhere
*.tar.bz2
...
...
bin/tools/foamConfigurePaths
View file @
f9d61d7e
...
...
@@ -146,7 +146,7 @@ do
paraviewInstall
=
"
$2
"
# replace ParaView_DIR=...
_inlineSed
\
etc/config/paraview
.sh
\
etc/config
.sh
/paraview
\
'ParaView_DIR=.*'
\
'ParaView_DIR='
"
$paraviewInstall
"
\
"Replacing ParaView_DIR setting by '
$paraviewInstall
'"
...
...
@@ -157,7 +157,7 @@ do
paraviewVersion
=
"
$2
"
# replace ParaView_VERSION=...
_inlineSed
\
etc/config/paraview
.sh
\
etc/config
.sh
/paraview
\
'ParaView_VERSION=.*'
\
'ParaView_VERSION='
"
$paraviewVersion
"
\
"Replacing ParaView_VERSION setting by '
$paraviewVersion
'"
...
...
@@ -167,7 +167,7 @@ do
[
"$#"
-ge
2
]
||
usage
"'
$1
' option requires an argument"
scotchVersion
=
"
$2
"
_inlineSed
\
etc/config/scotch
.sh
\
etc/config
.sh
/scotch
\
'SCOTCH_VERSION=.*'
\
'SCOTCH_VERSION='
"
$scotchVersion
"
\
"Replacing SCOTCH_VERSION setting by '
$scotchVersion
'"
...
...
@@ -177,7 +177,7 @@ do
[
"$#"
-ge
2
]
||
usage
"'
$1
' option requires an argument"
scotchArchPath
=
"
$2
"
_inlineSed
\
etc/config/scotch
.sh
\
etc/config
.sh
/scotch
\
'SCOTCH_ARCH_PATH=.*'
\
'SCOTCH_ARCH_PATH='
"
$scotchArchPath
"
\
"Replacing SCOTCH_ARCH_PATH setting by '
$scotchArchPath
'"
...
...
etc/config.sh/paraview
View file @
f9d61d7e
...
...
@@ -55,8 +55,8 @@ done
#export ParaView_VERSION=4.0.1
#export ParaView_VERSION=4.1.0
#export ParaView_VERSION=4.3.1
export
ParaView_VERSION
=
4.4.0
#
export ParaView_VERSION=5.0.0
#
export ParaView_VERSION=4.4.0
export
ParaView_VERSION
=
5.0.0
export
ParaView_MAJOR
=
detect
...
...
src/fvAgglomerationMethods/Allwmake
View file @
f9d61d7e
...
...
@@ -17,13 +17,13 @@ wmake $targetType pairPatchAgglomeration
## get SCOTCH_VERSION, SCOTCH_ARCH_PATH
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config/scotch
.sh
`
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config
.sh
/scotch
`
then
.
$settings
echo
"using SCOTCH_ARCH_PATH=
$SCOTCH_ARCH_PATH
"
else
echo
echo
"Error: no config/scotch
.sh
settings"
echo
"Error: no config
.sh
/scotch settings"
echo
fi
...
...
src/parallel/decompose/Allwmake
View file @
f9d61d7e
...
...
@@ -6,13 +6,13 @@ targetType=libso
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config/scotch
.sh
`
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config
.sh
/scotch
`
then
.
$settings
echo
"using SCOTCH_ARCH_PATH=
$SCOTCH_ARCH_PATH
"
else
echo
echo
"Error: no config/scotch
.sh
settings"
echo
"Error: no config
.sh
/scotch settings"
echo
fi
...
...
src/parallel/decompose/metisDecomp/Allwmake
View file @
f9d61d7e
...
...
@@ -6,7 +6,7 @@ targetType=libso
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
# get METIS_VERSION, METIS_ARCH_PATH
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config/metis
.sh
`
if
settings
=
`
$WM_PROJECT_DIR
/bin/foamEtcFile config
.sh
/metis
`
then
.
$settings
echo
"using METIS_ARCH_PATH=
$METIS_ARCH_PATH
"
...
...
@@ -16,7 +16,7 @@ then
fi
else
echo
echo
"Error: no config/metis
.sh
settings"
echo
"Error: no config
.sh
/metis settings"
echo
fi
...
...
src/renumber/Allwmake
View file @
f9d61d7e
...
...
@@ -6,13 +6,13 @@ targetType=libso
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
## get ZOLTAN_ARCH_PATH
#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/zoltan
.sh
`
#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config
.sh
/zoltan`
#then
# . $settings
# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
#else
# echo
# echo "Error: no config/zoltan
.sh
settings"
# echo "Error: no config
.sh
/zoltan settings"
# echo
#fi
...
...
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