exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: Minor clean-up of etc files

Browse source
This commit is contained in:
Hrvoje Jasak 2017-01-10 15:42:15 +00:00
parent 8bc571ee46
commit a33b0022a4
7 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/bashrc
View file

@ -91,11 +91,11 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
# Use 'set' and 'unset' to adjust for your environent # Use 'set' and 'unset' to adjust for your environent
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1 # For AllMake.stage1
export WM_THIRD_PARTY_USE_CMAKE_322=1 #export WM_THIRD_PARTY_USE_CMAKE_322=1
# #
# For AllMake.stage2 # For AllMake.stage2
export WM_THIRD_PARTY_USE_OPENMPI_165=1 #export WM_THIRD_PARTY_USE_OPENMPI_165=1
# #
# For AllMake.stage3 # For AllMake.stage3

2
etc/controlDict-EXAMPLE
View file

@ -943,7 +943,7 @@ Tolerances
slidingEdgeEndCutoffTol 0.0001; slidingEdgeEndCutoffTol 0.0001;
slidingEdgeCoPlanarTol 0.8; slidingEdgeCoPlanarTol 0.8;
GGIAreaErrorTol 1e-8; GGIAreaErrorTol 1e-8;
} }
DimensionedConstants DimensionedConstants

4
etc/cshrc
View file

@ -77,11 +77,11 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
# This can be overriden in prefs.sh # This can be overriden in prefs.sh
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# For AllMake.stage1 # For AllMake.stage1
setenv WM_THIRD_PARTY_USE_CMAKE_322 1 #setenv WM_THIRD_PARTY_USE_CMAKE_322 1
# #
# For AllMake.stage2 # For AllMake.stage2
setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_165 1
# #
# For AllMake.stage3 # For AllMake.stage3

3
etc/prefs.csh-EXAMPLE
View file

@ -210,6 +210,9 @@ setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
#setenv WM_THIRD_PARTY_USE_OPENMPI_15 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_15 1
#setenv WM_THIRD_PARTY_USE_OPENMPI_143 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_143 1
#setenv WM_THIRD_PARTY_USE_OPENMPI_141 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_141 1
#setenv WM_THIRD_PARTY_USE_MVAPICH2_22 1
#setenv WM_THIRD_PARTY_USE_MVAPICH2_22_ConfigureAdditionalArgs '--disable-mcast'
# #
# For AllMake.stage3 # For AllMake.stage3

3
etc/prefs.sh-EXAMPLE
View file

@ -220,6 +220,9 @@ export WM_THIRD_PARTY_USE_OPENMPI_188=1
#export WM_THIRD_PARTY_USE_OPENMPI_15=1 #export WM_THIRD_PARTY_USE_OPENMPI_15=1
#export WM_THIRD_PARTY_USE_OPENMPI_143=1 #export WM_THIRD_PARTY_USE_OPENMPI_143=1
#export WM_THIRD_PARTY_USE_OPENMPI_141=1 #export WM_THIRD_PARTY_USE_OPENMPI_141=1
#export WM_THIRD_PARTY_USE_MVAPICH2_22=1
#export WM_THIRD_PARTY_USE_MVAPICH2_22_ConfigureAdditionalArgs='--disable-mcast'
# #
# For AllMake.stage3 # For AllMake.stage3

15
etc/settings.csh
View file

@ -300,17 +300,12 @@ case SYSTEMOPENMPI:
breaksw breaksw
case MVAPICH2: case MVAPICH2:
set mpi_version=mvapich2 set mpi_version=mvapich2-2.2
if ($?WM_THIRD_PARTY_USE_MVAPICH2_22 != 0 && -d $WM_THIRD_PARTY_DIR/packages/mvapich2-2.2/platforms/$WM_OPTIONS ) then
if ($?MVAPICH2_BIN_DIR != 0) then if ($?FOAM_VERBOSE && $?prompt) then
if (-d "${MVAPICH2_BIN_DIR}" ) then echo "Using mvapich2-2.2 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
_foamAddPath $MVAPICH2_BIN_DIR
endif endif
else _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh
set mpicc_cmd=`which mpicc`
setenv MVAPICH2_BIN_DIR `dirname $mpicc_cmd`
unset mpicc_cmd
endif
setenv MPI_HOME `dirname $MVAPICH2_BIN_DIR` setenv MPI_HOME `dirname $MVAPICH2_BIN_DIR`
setenv MPI_ARCH_PATH $MPI_HOME setenv MPI_ARCH_PATH $MPI_HOME

8
etc/settings.sh
View file

@ -220,7 +220,7 @@ OPENMPI)
then then
echo "Using openmpi-1.8.8 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.8.8 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
fi fi
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_165 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ] elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_165 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ]
then then
@ -229,7 +229,7 @@ OPENMPI)
then then
echo "Using openmpi-1.6.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.6.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
fi fi
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_143 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ] elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_143 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ]
then then
@ -238,7 +238,7 @@ OPENMPI)
then then
echo "Using openmpi-1.4.3 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.4.3 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
fi fi
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_15 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ] elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_15 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ]
then then
@ -247,7 +247,7 @@ OPENMPI)
then then
echo "Using openmpi-1.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" echo "Using openmpi-1.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
fi fi
_foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
fi fi
# On Windows set mpi_version from value defined in bashrc.mingw: # On Windows set mpi_version from value defined in bashrc.mingw: