diff --git a/etc/bashrc b/etc/bashrc
index 62c9854d951170d0c442782c23d7a16aba1ade5a..6cd4d8a8cfa3328772e2aa5bf5a83ee5689208e6 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -200,7 +200,7 @@ export PATH LD_LIBRARY_PATH MANPATH
# Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/settings.sh
+_foamSource $WM_PROJECT_DIR/etc/config/settings.sh
_foamSource $WM_PROJECT_DIR/etc/config/aliases.sh
diff --git a/etc/config/README b/etc/config/README
index 8c22b460161d4dff2610e4471fb3502a73421cf7..2ad58dda547022578aff318ac6329aad4270a497 100644
--- a/etc/config/README
+++ b/etc/config/README
@@ -3,9 +3,6 @@ The main OpenFOAM settings are located in the parent etc/ directory
* bashrc, cshrc
entry point for sourcing
-* settings.csh, settings.sh
- core settings
-
* prefs.csh, prefs.sh
these files are untracked and can be used for some site-defined
settings
@@ -14,6 +11,9 @@ The main OpenFOAM settings are located in the parent etc/ directory
The etc/config/ directory contains various configuration files in
sh/csh variants:
+* settings.csh, settings.sh
+ core settings
+
* aliases.csh, aliases.sh
aliases for interactive shells
diff --git a/etc/config/example/compiler.csh b/etc/config/example/compiler.csh
index 6905daf8bd64f72d5cd644a41bd58ca09ab1debd..a317a703c5edaf63fb4ee43b773c3e32726c1d21 100644
--- a/etc/config/example/compiler.csh
+++ b/etc/config/example/compiler.csh
@@ -26,7 +26,7 @@
#
# Description
# Example of fine tuning ThirdParty compiler settings for OpenFOAM
-# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
+# Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
#
#------------------------------------------------------------------------------
diff --git a/etc/config/example/compiler.sh b/etc/config/example/compiler.sh
index 7dffdcc10c4f25649e6a61a41a4dae7c4e11a35a..3f13b1d9eaa119ffb38daa0bcd1f1a31267816f3 100644
--- a/etc/config/example/compiler.sh
+++ b/etc/config/example/compiler.sh
@@ -26,7 +26,7 @@
#
# Description
# Example of fine tuning ThirdParty compiler settings for OpenFOAM
-# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
+# Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
#
#------------------------------------------------------------------------------
diff --git a/etc/config/example/openmpi.csh b/etc/config/example/openmpi.csh
index da07872d31b7eee9742971fd3b9e36d6139e5542..6b46e7494cfd2342cbea6858f2d7db138f613922 100644
--- a/etc/config/example/openmpi.csh
+++ b/etc/config/example/openmpi.csh
@@ -26,7 +26,7 @@
#
# Description
# Example of fine tuning openmpi settings for OpenFOAM
-# Sourced from OpenFOAM-<VERSION>/etc/settings.csh
+# Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
#
#------------------------------------------------------------------------------
diff --git a/etc/config/example/openmpi.sh b/etc/config/example/openmpi.sh
index 7c0ed18543136e16e0b31e39fc6ebdbcbf8e88a6..1573aadf52f1351c32f477cc3cd0c12fa3be0c0b 100644
--- a/etc/config/example/openmpi.sh
+++ b/etc/config/example/openmpi.sh
@@ -26,7 +26,7 @@
#
# Description
# Example of fine tuning openmpi settings for OpenFOAM
-# Sourced from OpenFOAM-<VERSION>/etc/settings.sh
+# Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
#
#------------------------------------------------------------------------------
diff --git a/etc/settings.csh b/etc/config/settings.csh
similarity index 98%
rename from etc/settings.csh
rename to etc/config/settings.csh
index b3daf1e2884c471bb3ff465c21f540dc43838b63..986a35a1b6185b14318855abafdab83fd59c1d23 100644
--- a/etc/settings.csh
+++ b/etc/config/settings.csh
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
-# etc/settings.csh
+# etc/config/settings.csh
#
# Description
# Startup file for OpenFOAM
@@ -193,7 +193,7 @@ unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?foamCompiler ) then
set foamCompiler=system
- echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " foamCompiler not set, using '$foamCompiler'"
endif
@@ -241,7 +241,7 @@ case ThirdParty:
breaksw
default:
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Unknown OpenFOAM compiler type '$WM_COMPILER'"
echo " Please check your settings"
echo
@@ -262,7 +262,7 @@ case ThirdParty:
# Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'"
@@ -302,7 +302,7 @@ case ThirdParty:
# Check that the compiler directory can be found
if ( ! -d "$clangDir" ) then
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'"
diff --git a/etc/settings.sh b/etc/config/settings.sh
similarity index 97%
rename from etc/settings.sh
rename to etc/config/settings.sh
index 954868dad157e58c271ae94d02e808128bb1cb58..086ab174c9c7a2abf983f093a58a349cfdc4a26b 100644
--- a/etc/settings.sh
+++ b/etc/config/settings.sh
@@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# File
-# etc/settings.sh
+# etc/config/settings.sh
#
# Description
# Startup file for OpenFOAM
@@ -215,7 +215,7 @@ unset MPFR_ARCH_PATH GMP_ARCH_PATH
if [ -z "$foamCompiler" ]
then
foamCompiler=system
- echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" 1>&2
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
echo " foamCompiler not set, using '$foamCompiler'" 1>&2
fi
@@ -258,7 +258,7 @@ OpenFOAM | ThirdParty)
;;
*)
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Unknown OpenFOAM compiler type '$WM_COMPILER'"
echo " Please check your settings"
echo
@@ -278,7 +278,7 @@ OpenFOAM | ThirdParty)
# Check that the compiler directory can be found
[ -d "$gccDir" ] || {
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'"
@@ -322,7 +322,7 @@ OpenFOAM | ThirdParty)
# Check that the compiler directory can be found
[ -d "$clangDir" ] || {
echo
- echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
+ echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'"
diff --git a/etc/cshrc b/etc/cshrc
index c87986832ab3d7829fa4e63aa4a9acf65c6da1d9..8e2597e9012da2e54592ede97bd35e388231fbac 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -194,7 +194,7 @@ if ( $status == 0 ) setenv MANPATH $cleaned
# Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/settings.csh
+_foamSource $WM_PROJECT_DIR/etc/config/settings.csh
_foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
# Source user setup files for optional packages