songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for changes to etc/config structure

Browse Source
This commit is contained in:
Henry Weller 2016-02-10 16:20:19 +00:00
parent bbcfb50965
commit f9d61d7e3c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -58,8 +58,8 @@ doc/Doxygen/DTAGS
# Untracked configuration files # Untracked configuration files
/etc/prefs.csh /etc/prefs.csh
/etc/prefs.sh /etc/prefs.sh
/etc/config/prefs.csh /etc/config.csh/prefs.csh
/etc/config/prefs.sh /etc/config.sh/prefs.sh
# Source packages - anywhere # Source packages - anywhere
*.tar.bz2 *.tar.bz2

8
bin/tools/foamConfigurePaths
View File

@ -146,7 +146,7 @@ do
paraviewInstall="$2" paraviewInstall="$2"
# replace ParaView_DIR=... # replace ParaView_DIR=...
_inlineSed \ _inlineSed \
etc/config/paraview.sh \ etc/config.sh/paraview \
'ParaView_DIR=.*' \ 'ParaView_DIR=.*' \
'ParaView_DIR='"$paraviewInstall" \ 'ParaView_DIR='"$paraviewInstall" \
"Replacing ParaView_DIR setting by '$paraviewInstall'" "Replacing ParaView_DIR setting by '$paraviewInstall'"
@ -157,7 +157,7 @@ do
paraviewVersion="$2" paraviewVersion="$2"
# replace ParaView_VERSION=... # replace ParaView_VERSION=...
_inlineSed \ _inlineSed \
etc/config/paraview.sh \ etc/config.sh/paraview \
'ParaView_VERSION=.*' \ 'ParaView_VERSION=.*' \
'ParaView_VERSION='"$paraviewVersion" \ 'ParaView_VERSION='"$paraviewVersion" \
"Replacing ParaView_VERSION setting by '$paraviewVersion'" "Replacing ParaView_VERSION setting by '$paraviewVersion'"
@ -167,7 +167,7 @@ do
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
scotchVersion="$2" scotchVersion="$2"
_inlineSed \ _inlineSed \
etc/config/scotch.sh \ etc/config.sh/scotch \
'SCOTCH_VERSION=.*' \ 'SCOTCH_VERSION=.*' \
'SCOTCH_VERSION='"$scotchVersion" \ 'SCOTCH_VERSION='"$scotchVersion" \
"Replacing SCOTCH_VERSION setting by '$scotchVersion'" "Replacing SCOTCH_VERSION setting by '$scotchVersion'"
@ -177,7 +177,7 @@ do
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
scotchArchPath="$2" scotchArchPath="$2"
_inlineSed \ _inlineSed \
etc/config/scotch.sh \ etc/config.sh/scotch \
'SCOTCH_ARCH_PATH=.*' \ 'SCOTCH_ARCH_PATH=.*' \
'SCOTCH_ARCH_PATH='"$scotchArchPath" \ 'SCOTCH_ARCH_PATH='"$scotchArchPath" \
"Replacing SCOTCH_ARCH_PATH setting by '$scotchArchPath'" "Replacing SCOTCH_ARCH_PATH setting by '$scotchArchPath'"

4
etc/config.sh/paraview
View File

@ -55,8 +55,8 @@ done
#export ParaView_VERSION=4.0.1 #export ParaView_VERSION=4.0.1
#export ParaView_VERSION=4.1.0 #export ParaView_VERSION=4.1.0
#export ParaView_VERSION=4.3.1 #export ParaView_VERSION=4.3.1
export ParaView_VERSION=4.4.0 #export ParaView_VERSION=4.4.0
#export ParaView_VERSION=5.0.0 export ParaView_VERSION=5.0.0
export ParaView_MAJOR=detect export ParaView_MAJOR=detect

4
src/fvAgglomerationMethods/Allwmake
View File

@ -17,13 +17,13 @@ wmake $targetType pairPatchAgglomeration
## get SCOTCH_VERSION, SCOTCH_ARCH_PATH ## 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 then
. $settings . $settings
echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH" echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
else else
echo echo
echo "Error: no config/scotch.sh settings" echo "Error: no config.sh/scotch settings"
echo echo
fi fi

4
src/parallel/decompose/Allwmake
View File

@ -6,13 +6,13 @@ targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH # 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 then
. $settings . $settings
echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH" echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
else else
echo echo
echo "Error: no config/scotch.sh settings" echo "Error: no config.sh/scotch settings"
echo echo
fi fi

4
src/parallel/decompose/metisDecomp/Allwmake
View File

@ -6,7 +6,7 @@ targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get METIS_VERSION, METIS_ARCH_PATH # 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 then
. $settings . $settings
echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH" echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
@ -16,7 +16,7 @@ then
fi fi
else else
echo echo
echo "Error: no config/metis.sh settings" echo "Error: no config.sh/metis settings"
echo echo
fi fi

4
src/renumber/Allwmake
View File

@ -6,13 +6,13 @@ targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
## get ZOLTAN_ARCH_PATH ## 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 #then
# . $settings # . $settings
# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH" # echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
#else #else
# echo # echo
# echo "Error: no config/zoltan.sh settings" # echo "Error: no config.sh/zoltan settings"
# echo # echo
#fi #fi