diff --git a/bin/foamEtcFile b/bin/foamEtcFile index b6d95b877e..cde9316675 100755 --- a/bin/foamEtcFile +++ b/bin/foamEtcFile @@ -227,7 +227,7 @@ esac case "$mode" in *g*) # group (site) siteDir="${WM_PROJECT_SITE:-$prefixDir/site}" - dirList="$dirList $siteDir/$version $siteDir" + dirList="$dirList $siteDir/$version/etc $siteDir/etc" ;; esac diff --git a/bin/foamGet b/bin/foamGet index 3ea36da072..525c394114 100755 --- a/bin/foamGet +++ b/bin/foamGet @@ -140,9 +140,12 @@ noFilesMessage () { } searchDirs="\ + ${HOME}/.OpenFOAM/$WM_PROJECT_VERSION \ ${HOME}/.OpenFOAM \ - $WM_PROJECT_SITE \ - $WM_PROJECT_INST_DIR/site \ + $WM_PROJECT_SITE/$WM_PROJECT_VERSION/etc \ + $WM_PROJECT_SITE/etc \ + $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/etc \ + $WM_PROJECT_INST_DIR/site/etc \ $FOAM_ETC/caseDicts" ext="ANY" diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org index b3a80ede2c..bbcd30f485 100644 --- a/doc/codingStyleGuide.org +++ b/doc/codingStyleGuide.org @@ -115,9 +115,9 @@ // - ~/.OpenFOAM/ // for version-independent files // -# site-wide settings: - // - $WM_PROJECT_INST_DIR/site/\ + // - $WM_PROJECT_INST_DIR/site/\/etc/ // for version-specific files - // - $WM_PROJECT_INST_DIR/site/ + // - $WM_PROJECT_INST_DIR/site/etc/ // for version-independent files // -# shipped settings: // - $WM_PROJECT_DIR/etc/ diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index 480bc46d07..d5c0781dce 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -5880,9 +5880,12 @@ _foamGet_ () { _searchDirs () { _dirs=="\ + ${HOME}/.OpenFOAM/$WM_PROJECT_VERSION \ ${HOME}/.OpenFOAM \ - $WM_PROJECT_SITE \ - $WM_PROJECT_INST_DIR/site \ + $WM_PROJECT_SITE/$WM_PROJECT_VERSION/etc \ + $WM_PROJECT_SITE/etc \ + $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/etc \ + $WM_PROJECT_INST_DIR/site/etc \ $FOAM_ETC/caseDicts" _files="" diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H index b40090a8c9..b8d0a9df93 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeEtcEntry/includeEtcEntry.H @@ -35,11 +35,11 @@ Description - ~/.OpenFOAM/\ - ~/.OpenFOAM/ - \b group (site) settings (when $WM_PROJECT_SITE is set): - - $WM_PROJECT_SITE/\ - - $WM_PROJECT_SITE + - $WM_PROJECT_SITE/\/etc/ + - $WM_PROJECT_SITE/etc/ - \b group (site) settings (when $WM_PROJECT_SITE is not set): - - $WM_PROJECT_INST_DIR/site/\ - - $WM_PROJECT_INST_DIR/site/ + - $WM_PROJECT_INST_DIR/site/\/etc/ + - $WM_PROJECT_INST_DIR/site/etc/ - \b other (shipped) settings: - $WM_PROJECT_DIR/etc/ diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H index 7505add3ff..cb6a4ca23e 100644 --- a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H +++ b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H @@ -35,11 +35,11 @@ Description - ~/.OpenFOAM/\/caseDicts/postProcessing - ~/.OpenFOAM/caseDicts/postProcessing - \b group (site) settings (when $WM_PROJECT_SITE is set): - - $WM_PROJECT_SITE/\/caseDicts/postProcessing - - $WM_PROJECT_SITE/caseDicts/postProcessing + - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing + - $WM_PROJECT_SITE/etc/caseDicts/postProcessing - \b group (site) settings (when $WM_PROJECT_SITE is not set): - - $WM_PROJECT_INST_DIR/site/\/caseDicts/postProcessing - - $WM_PROJECT_INST_DIR/site/caseDicts/postProcessing + - $WM_PROJECT_INST_DIR/site/\/etc/caseDicts/postProcessing + - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing - \b other (shipped) settings: - $WM_PROJECT_DIR/etc/caseDicts/postProcessing diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H index f47931e5f9..077e5c07db 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H @@ -179,11 +179,12 @@ public: // - ~/.OpenFOAM/\/caseDicts/postProcessing // - ~/.OpenFOAM/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is set): - // - $WM_PROJECT_SITE/\/caseDicts/postProcessing - // - $WM_PROJECT_SITE/caseDicts/postProcessing + // - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing + // - $WM_PROJECT_SITE/etc/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is not set): - // - $WM_PROJECT_INST_DIR/site/\/caseDicts/postProcessing - // - $WM_PROJECT_INST_DIR/site/caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/\/etc/ + // caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing // - \b other (shipped) settings: // - $WM_PROJECT_DIR/etc/caseDicts/postProcessing static void list(); @@ -196,11 +197,12 @@ public: // - ~/.OpenFOAM/\/caseDicts/postProcessing // - ~/.OpenFOAM/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is set): - // - $WM_PROJECT_SITE/\/caseDicts/postProcessing - // - $WM_PROJECT_SITE/caseDicts/postProcessing + // - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing + // - $WM_PROJECT_SITE/etc/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is not set): - // - $WM_PROJECT_INST_DIR/site/\/caseDicts/postProcessing - // - $WM_PROJECT_INST_DIR/site/caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/\/etc/ + // caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing // - \b other (shipped) settings: // - $WM_PROJECT_DIR/etc/caseDicts/postProcessing // @@ -221,11 +223,12 @@ public: // - ~/.OpenFOAM/\/caseDicts/postProcessing // - ~/.OpenFOAM/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is set): - // - $WM_PROJECT_SITE/\/caseDicts/postProcessing - // - $WM_PROJECT_SITE/caseDicts/postProcessing + // - $WM_PROJECT_SITE/\/etc/caseDicts/postProcessing + // - $WM_PROJECT_SITE/etc/caseDicts/postProcessing // - \b group (site) settings (when $WM_PROJECT_SITE is not set): - // - $WM_PROJECT_INST_DIR/site/\/caseDicts/postProcessing - // - $WM_PROJECT_INST_DIR/site/caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/\/etc/ + // caseDicts/postProcessing + // - $WM_PROJECT_INST_DIR/site/etc/caseDicts/postProcessing // - \b other (shipped) settings: // - $WM_PROJECT_DIR/etc/caseDicts/postProcessing // diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.C b/src/OpenFOAM/global/etcFiles/etcFiles.C index 1173feecdc..05f59f8e9f 100644 --- a/src/OpenFOAM/global/etcFiles/etcFiles.C +++ b/src/OpenFOAM/global/etcFiles/etcFiles.C @@ -54,21 +54,21 @@ Foam::fileNameList Foam::findEtcDirs(const fileName& local) } // Search for group (site) directories in - // * $WM_PROJECT_SITE/VERSION - // * $WM_PROJECT_SITE + // * $WM_PROJECT_SITE/VERSION/etc/ + // * $WM_PROJECT_SITE/etc/ // searchDir = getEnv("WM_PROJECT_SITE"); if (searchDir.size()) { if (isDir(searchDir)) { - fileName fullName = searchDir/FOAMversion/local; + fileName fullName = searchDir/FOAMversion/"etc"/local; if (isDir(fullName)) { dirs.append(fullName); } - fullName = searchDir/local; + fullName = searchDir/"etc"/local; if (isDir(fullName)) { dirs.append(fullName); @@ -78,19 +78,19 @@ Foam::fileNameList Foam::findEtcDirs(const fileName& local) else { // Or search for group (site) files in - // * $WM_PROJECT_INST_DIR/site/VERSION - // * $WM_PROJECT_INST_DIR/site + // * $WM_PROJECT_INST_DIR/site/VERSION/etc/ + // * $WM_PROJECT_INST_DIR/site/etc/ // searchDir = getEnv("WM_PROJECT_INST_DIR"); if (isDir(searchDir)) { - fileName fullName = searchDir/"site"/FOAMversion/local; + fileName fullName = searchDir/"site/etc"/FOAMversion/local; if (isDir(fullName)) { dirs.append(fullName); } - fullName = searchDir/"site"/local; + fullName = searchDir/"site/etc"/local; if (isDir(fullName)) { dirs.append(fullName); @@ -153,15 +153,15 @@ Foam::fileNameList Foam::findEtcFiles } // Search for group (site) files in - // * $WM_PROJECT_SITE/VERSION - // * $WM_PROJECT_SITE + // * $WM_PROJECT_SITE/VERSION/etc/ + // * $WM_PROJECT_SITE/etc/ // searchDir = getEnv("WM_PROJECT_SITE"); if (searchDir.size()) { if (isDir(searchDir)) { - fileName fullName = searchDir/FOAMversion/name; + fileName fullName = searchDir/FOAMversion/"etc"/name; if (isFile(fullName)) { results.append(fullName); @@ -171,7 +171,7 @@ Foam::fileNameList Foam::findEtcFiles } } - fullName = searchDir/name; + fullName = searchDir/"etc"/name; if (isFile(fullName)) { results.append(fullName); @@ -185,13 +185,13 @@ Foam::fileNameList Foam::findEtcFiles else { // Or search for group (site) files in - // * $WM_PROJECT_INST_DIR/site/VERSION - // * $WM_PROJECT_INST_DIR/site + // * $WM_PROJECT_INST_DIR/site/VERSION/etc/ + // * $WM_PROJECT_INST_DIR/site/etc/ // searchDir = getEnv("WM_PROJECT_INST_DIR"); if (isDir(searchDir)) { - fileName fullName = searchDir/"site"/FOAMversion/name; + fileName fullName = searchDir/"site/etc"/FOAMversion/name; if (isFile(fullName)) { results.append(fullName); @@ -201,7 +201,7 @@ Foam::fileNameList Foam::findEtcFiles } } - fullName = searchDir/"site"/name; + fullName = searchDir/"site/etc"/name; if (isFile(fullName)) { results.append(fullName); diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.H b/src/OpenFOAM/global/etcFiles/etcFiles.H index aeb6e69dde..4db6f0bfc0 100644 --- a/src/OpenFOAM/global/etcFiles/etcFiles.H +++ b/src/OpenFOAM/global/etcFiles/etcFiles.H @@ -48,14 +48,14 @@ namespace Foam // The search scheme allows for version-specific and // version-independent files using the following hierarchy: // - \b user settings: -// - ~/.OpenFOAM/\ +// - ~/.OpenFOAM/\/ // - ~/.OpenFOAM/ // - \b group (site) settings (when $WM_PROJECT_SITE is set): -// - $WM_PROJECT_SITE/\ -// - $WM_PROJECT_SITE +// - $WM_PROJECT_SITE/\/etc/ +// - $WM_PROJECT_SITE/etc/ // - \b group (site) settings (when $WM_PROJECT_SITE is not set): -// - $WM_PROJECT_INST_DIR/site/\ -// - $WM_PROJECT_INST_DIR/site/ +// - $WM_PROJECT_INST_DIR/site/\/etc/ +// - $WM_PROJECT_INST_DIR/site/etc/ // - \b other (shipped) settings: // - $WM_PROJECT_DIR/etc/ // @@ -67,14 +67,14 @@ fileNameList findEtcDirs(const fileName& local = fileName::null); // The search scheme allows for version-specific and // version-independent files using the following hierarchy: // - \b user settings: -// - ~/.OpenFOAM/\ +// - ~/.OpenFOAM/\/ // - ~/.OpenFOAM/ // - \b group (site) settings (when $WM_PROJECT_SITE is set): -// - $WM_PROJECT_SITE/\ -// - $WM_PROJECT_SITE +// - $WM_PROJECT_SITE/\/etc/ +// - $WM_PROJECT_SITE/etc/ // - \b group (site) settings (when $WM_PROJECT_SITE is not set): -// - $WM_PROJECT_INST_DIR/site/\ -// - $WM_PROJECT_INST_DIR/site/ +// - $WM_PROJECT_INST_DIR/site/\/etc/ +// - $WM_PROJECT_INST_DIR/site/etc/ // - \b other (shipped) settings: // - $WM_PROJECT_DIR/etc/ //