mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
added shared site configuration for bin/lib files
- useful location for sharing in-house solvers, libraries, etc for use at the entire site - similar naming convention as ~OpenFOAM expansion: FOAM_SITE_APPBIN= $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS FOAM_SITE_LIBBIN= $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
This commit is contained in:
@ -45,15 +45,19 @@ setenv WM_LINK_LANGUAGE c++
|
|||||||
setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
|
setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
|
||||||
|
|
||||||
# base configuration
|
# 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_APP $WM_PROJECT_DIR/applications
|
||||||
setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
|
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
|
# 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_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
|
||||||
|
setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
|
||||||
|
|
||||||
# convenience
|
# convenience
|
||||||
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
|
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)
|
set path=($WM_DIR $WM_PROJECT_DIR/bin $path)
|
||||||
|
|
||||||
_foamAddPath $FOAM_APPBIN
|
_foamAddPath $FOAM_APPBIN
|
||||||
|
_foamAddPath $FOAM_SITE_APPBIN
|
||||||
_foamAddPath $FOAM_USER_APPBIN
|
_foamAddPath $FOAM_USER_APPBIN
|
||||||
_foamAddLib $FOAM_LIBBIN
|
_foamAddLib $FOAM_LIBBIN
|
||||||
|
_foamAddLib $FOAM_SITE_LIBBIN
|
||||||
_foamAddLib $FOAM_USER_LIBBIN
|
_foamAddLib $FOAM_USER_LIBBIN
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -61,15 +61,19 @@ export WM_LINK_LANGUAGE=c++
|
|||||||
export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
|
export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION
|
||||||
|
|
||||||
# base configuration
|
# 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_APP=$WM_PROJECT_DIR/applications
|
||||||
export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS
|
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
|
# 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_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS
|
||||||
|
export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS
|
||||||
|
|
||||||
# convenience
|
# convenience
|
||||||
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
|
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
|
# add OpenFOAM scripts and wmake to the path
|
||||||
export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
|
export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
|
||||||
|
|
||||||
_foamAddPath $FOAM_APPBIN $FOAM_USER_APPBIN
|
_foamAddPath $FOAM_APPBIN $FOAM_SITE_APPBIN $FOAM_USER_APPBIN
|
||||||
_foamAddLib $FOAM_LIBBIN $FOAM_USER_LIBBIN
|
_foamAddLib $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN
|
||||||
|
|
||||||
|
|
||||||
# Compiler settings
|
# Compiler settings
|
||||||
|
|||||||
Reference in New Issue
Block a user