diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 31068213ecde128605d1dc94ccefd721c4fc6ec8..126489bf9b70c177bde72f3e592c2bc6135a8a4b 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -14,7 +14,7 @@
# foamConfigurePaths
#
# Description
-# Adjust hardcoded versions and installation paths (for bash, POSIX shell).
+# Adjust hardcoded installation versions and paths in bashrc and config.sh/
#
#------------------------------------------------------------------------------
usage() {
@@ -30,8 +30,8 @@ usage: ${0##*/}
-SP | -float32 specify 'WM_PRECISION_OPTION'
-DP | -float64 specify 'WM_PRECISION_OPTION'
-int32 | -int64 specify 'WM_LABEL_SIZE'
- -system NAME specify 'system' compiler to be used
- -third NAME specify 'ThirdParty' compiler to be used
+ -system NAME specify 'system' compiler to use (eg, Gcc, Icc,...)
+ -third NAME specify 'ThirdParty' compiler to use (eg, Clang40,...)
-boost VER specify 'boost_version'
-boost-path DIR specify 'BOOST_ARCH_PATH'
-cgal ver specify 'cgal_version'
@@ -40,16 +40,18 @@ usage: ${0##*/}
-cmake VER specify 'cmake_version'
-fftw VER specify 'fffw_version'
-fftw-path DIR specify 'FFTW_ARCH_PATH'
+ -kahip VER specify 'KAHIP_VERSION'
+ -kahip-path DIR specify 'KAHIP_ARCH_PATH'
-metis ver specify 'METIS_VERSION'
-metis-path DIR specify 'METIS_ARCH_PATH'
-paraview VER specify 'ParaView_VERSION' (eg, 5.4.1)
-paraview-path DIR specify 'ParaView_DIR' (eg, /opt/ParaView-5.4.1)
- -mpi NAME specify type for 'WM_MPLIB' (eg, FJMPI, INTELMPI, etc)
+ -mpi NAME specify 'WM_MPLIB' type (eg, FJMPI, INTELMPI, etc)
-openmpi VER specify ThirdParty openmpi version for 'FOAM_MPI'
-openmpi-system activate system openmpi
-openmpi-third activate ThirdParty openmpi (using default version)
-scotch VER specify 'SCOTCH_VERSION' (eg, scotch_6.0.4)
- -scotch-path dir specify 'SCOTCH_ARCH_PATH' (eg, /opt/OpenFOAM-scotch_6.0.4)
+ -scotch-path DIR specify 'SCOTCH_ARCH_PATH' (eg, /opt/OpenFOAM-scotch_6.0.4)
-vtk VER specify 'vtk_version' (eg, VTK-7.1.0)
-mesa VER specify 'mesa_version' (eg, mesa-13.0.1)
-sigfpe | -no-sigfpe [defunct - now under etc/controlDict]
diff --git a/etc/controlDict b/etc/controlDict
index 3c5749e0564c0a1121da086d832df401dbf5fef7..672363c30f4cc8a6dc06c664c31fc07c904c13a3 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -80,7 +80,7 @@ OptimisationSwitches
fileHandler uncollated;
//- collated: thread buffer size for queued file writes.
- // If set to 0 or not sufficient for the file size threading is not used.
+ // If set to 0 or not sufficient for the file size, threading is not used.
// Default: 1e9
maxThreadFileBufferSize 0;
@@ -108,11 +108,11 @@ OptimisationSwitches
maxCommsSize 0;
// Trap floating point exception.
- // Can override with FOAM_SIGFPE (true|false)
+ // Can override with FOAM_SIGFPE env variable (true|false)
trapFpe 1;
// Initialization malloced memory to NaN.
- // Can override with FOAM_SETNAN (true|false)
+ // Can override with FOAM_SETNAN env variable (true|false)
setNaN 0;
// Force dumping (at next timestep) upon signal (-1 to disable)
@@ -963,66 +963,66 @@ DebugSwitches
DimensionedConstants
{
- unitSet SI; // USCS
+ unitSet SI; // USCS
SICoeffs
{
universal
{
- c c [0 1 -1 0 0 0 0] 2.99792e+08;
- G G [-1 3 -2 0 0 0 0] 6.67429e-11;
- h h [1 2 -1 0 0 0 0] 6.62607e-34;
+ c c [0 1 -1 0 0 0 0] 2.99792e+08;
+ G G [-1 3 -2 0 0 0 0] 6.67429e-11;
+ h h [1 2 -1 0 0 0 0] 6.62607e-34;
}
electromagnetic
{
- e e [0 0 1 0 0 1 0] 1.60218e-19;
+ e e [0 0 1 0 0 1 0] 1.60218e-19;
}
atomic
{
- me me [1 0 0 0 0 0 0] 9.10938e-31;
- mp mp [1 0 0 0 0 0 0] 1.67262e-27;
+ me me [1 0 0 0 0 0 0] 9.10938e-31;
+ mp mp [1 0 0 0 0 0 0] 1.67262e-27;
}
physicoChemical
{
- mu mu [1 0 0 0 0 0 0] 1.66054e-27;
- k k [1 2 -2 -1 0 0 0] 1.38065e-23;
+ mu mu [1 0 0 0 0 0 0] 1.66054e-27;
+ k k [1 2 -2 -1 0 0 0] 1.38065e-23;
}
standard
{
//- Standard pressure [Pa]
- Pstd Pstd [1 -1 -2 0 0 0 0] 1e5;
+ Pstd Pstd [1 -1 -2 0 0 0 0] 1e5;
//- Standard temperature [degK]
- Tstd Tstd [0 0 0 1 0 0 0] 298.15;
+ Tstd Tstd [0 0 0 1 0 0 0] 298.15;
}
}
USCSCoeffs
{
universal
{
- c c [0 1 -1 0 0 0 0] 9.83558e+08;
- G G [-1 3 -2 0 0 0 0] 1.06909e-09;
- h h [1 2 -1 0 0 0 0] 1.57234e-32;
+ c c [0 1 -1 0 0 0 0] 9.83558e+08;
+ G G [-1 3 -2 0 0 0 0] 1.06909e-09;
+ h h [1 2 -1 0 0 0 0] 1.57234e-32;
}
electromagnetic
{
- e e [0 0 1 0 0 1 0] 1.60218e-19;
+ e e [0 0 1 0 0 1 0] 1.60218e-19;
}
atomic
{
- me me [1 0 0 0 0 0 0] 2.00825e-30;
- mp mp [1 0 0 0 0 0 0] 3.68746e-27;
+ me me [1 0 0 0 0 0 0] 2.00825e-30;
+ mp mp [1 0 0 0 0 0 0] 3.68746e-27;
}
physicoChemical
{
- mu mu [1 0 0 0 0 0 0] 3.66083e-27;
- k k [1 2 -2 -1 0 0 0] 1.82012e-22;
+ mu mu [1 0 0 0 0 0 0] 3.66083e-27;
+ k k [1 2 -2 -1 0 0 0] 1.82012e-22;
}
standard
{
//- Standard pressure [lbm/ft^2]
- Pstd Pstd [1 -1 -2 0 0 0 0] 2088.6;
+ Pstd Pstd [1 -1 -2 0 0 0 0] 2088.6;
//- Standard temperature [degR]
- Tstd Tstd [0 0 0 1 0 0 0] 536.67;
+ Tstd Tstd [0 0 0 1 0 0 0] 536.67;
}
}
}
@@ -1030,7 +1030,7 @@ DimensionedConstants
DimensionSets
{
- unitSet SI; // USCS
+ unitSet SI; // USCS
SICoeffs
{