From a33b0022a46eda70a6741149f3a3954853d210c2 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 10 Jan 2017 15:42:15 +0000 Subject: [PATCH] Bugfix: Minor clean-up of etc files --- etc/bashrc | 4 ++-- etc/controlDict-EXAMPLE | 2 +- etc/cshrc | 4 ++-- etc/prefs.csh-EXAMPLE | 3 +++ etc/prefs.sh-EXAMPLE | 3 +++ etc/settings.csh | 15 +++++---------- etc/settings.sh | 8 ++++---- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index de94a1b57..63a5143f3 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -91,11 +91,11 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty # Use 'set' and 'unset' to adjust for your environent # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # For AllMake.stage1 -export WM_THIRD_PARTY_USE_CMAKE_322=1 +#export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 -export WM_THIRD_PARTY_USE_OPENMPI_165=1 +#export WM_THIRD_PARTY_USE_OPENMPI_165=1 # # For AllMake.stage3 diff --git a/etc/controlDict-EXAMPLE b/etc/controlDict-EXAMPLE index e70f4285f..011913358 100644 --- a/etc/controlDict-EXAMPLE +++ b/etc/controlDict-EXAMPLE @@ -943,7 +943,7 @@ Tolerances slidingEdgeEndCutoffTol 0.0001; slidingEdgeCoPlanarTol 0.8; - GGIAreaErrorTol 1e-8; + GGIAreaErrorTol 1e-8; } DimensionedConstants diff --git a/etc/cshrc b/etc/cshrc index 94875fce6..0cf6c0bc0 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -77,11 +77,11 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty # This can be overriden in prefs.sh # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # For AllMake.stage1 -setenv WM_THIRD_PARTY_USE_CMAKE_322 1 +#setenv WM_THIRD_PARTY_USE_CMAKE_322 1 # # For AllMake.stage2 -setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 +#setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 # # For AllMake.stage3 diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index 7c59e8854..16d204def 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -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_143 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 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index b2c490599..c8c0e0de0 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -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_143=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 diff --git a/etc/settings.csh b/etc/settings.csh index fafa699df..d537042f7 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -300,17 +300,12 @@ case SYSTEMOPENMPI: breaksw case MVAPICH2: - set mpi_version=mvapich2 - - if ($?MVAPICH2_BIN_DIR != 0) then - if (-d "${MVAPICH2_BIN_DIR}" ) then - _foamAddPath $MVAPICH2_BIN_DIR + 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 ($?FOAM_VERBOSE && $?prompt) then + echo "Using mvapich2-2.2 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" endif - else - set mpicc_cmd=`which mpicc` - setenv MVAPICH2_BIN_DIR `dirname $mpicc_cmd` - unset mpicc_cmd - endif + _foamSource $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh setenv MPI_HOME `dirname $MVAPICH2_BIN_DIR` setenv MPI_ARCH_PATH $MPI_HOME diff --git a/etc/settings.sh b/etc/settings.sh index 5f2aee33e..eb59fa877 100755 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -220,7 +220,7 @@ OPENMPI) then echo "Using openmpi-1.8.8 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" 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 ] then @@ -229,7 +229,7 @@ OPENMPI) then echo "Using openmpi-1.6.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" 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 ] then @@ -238,7 +238,7 @@ OPENMPI) then echo "Using openmpi-1.4.3 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" 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 ] then @@ -247,7 +247,7 @@ OPENMPI) then echo "Using openmpi-1.5 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version" 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 # On Windows set mpi_version from value defined in bashrc.mingw: