diff --git a/etc/settings.csh b/etc/settings.csh index 495c9324e97ff24347595afb0f203026883d18b7..4370744be4f380b150a35ebe10be96769f857ccb 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -45,15 +45,19 @@ setenv WM_LINK_LANGUAGE c++ setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION # base configuration -setenv FOAM_SRC $WM_PROJECT_DIR/src -setenv FOAM_LIB $WM_PROJECT_DIR/lib -setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS setenv FOAM_APP $WM_PROJECT_DIR/applications setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS +setenv FOAM_LIB $WM_PROJECT_DIR/lib +setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS +setenv FOAM_SRC $WM_PROJECT_DIR/src + +# shared site configuration - similar naming convention as ~OpenFOAM expansion +setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS +setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS # user configuration -setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS +setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS # convenience setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials @@ -65,8 +69,10 @@ setenv FOAM_RUN $WM_PROJECT_USER_DIR/run set path=($WM_DIR $WM_PROJECT_DIR/bin $path) _foamAddPath $FOAM_APPBIN +_foamAddPath $FOAM_SITE_APPBIN _foamAddPath $FOAM_USER_APPBIN _foamAddLib $FOAM_LIBBIN +_foamAddLib $FOAM_SITE_LIBBIN _foamAddLib $FOAM_USER_LIBBIN diff --git a/etc/settings.sh b/etc/settings.sh index 6d640d20686b4edc72be5972b3833f70855fe87c..9d39e1eb866d49359641f19be0c149556593bed4 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -61,15 +61,19 @@ export WM_LINK_LANGUAGE=c++ export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION # base configuration -export FOAM_SRC=$WM_PROJECT_DIR/src -export FOAM_LIB=$WM_PROJECT_DIR/lib -export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS export FOAM_APP=$WM_PROJECT_DIR/applications export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS +export FOAM_LIB=$WM_PROJECT_DIR/lib +export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS +export FOAM_SRC=$WM_PROJECT_DIR/src + +# shared site configuration - similar naming convention as ~OpenFOAM expansion +export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS +export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS # user configuration -export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS +export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS # convenience export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials @@ -80,8 +84,8 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run # add OpenFOAM scripts and wmake to the path export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH -_foamAddPath $FOAM_APPBIN $FOAM_USER_APPBIN -_foamAddLib $FOAM_LIBBIN $FOAM_USER_LIBBIN +_foamAddPath $FOAM_APPBIN $FOAM_SITE_APPBIN $FOAM_USER_APPBIN +_foamAddLib $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN # Compiler settings