Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support point releases of OpenFOAM-2.4 and OpenFOAM-3 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support point releases of OpenFOAM-2.4 and OpenFOAM-3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0cd3d9
fixed bashrc file to recognize the point releases of OpenFOAM-2.4 and…
Jul 29, 2016
ef2cf08
Support the point releases of OpenFOAM-2.4 and OpenFOAM-3
Jul 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...an/cfdemParticle/etc/additionalLibs_2.4.x → ...gian/cfdemParticle/etc/additionalLibs_2.4
View file
Open in desktop
File renamed without changes.
0 ...an/cfdemParticle/etc/additionalLibs_3.0.x → ...gian/cfdemParticle/etc/additionalLibs_3.0
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions src/lagrangian/cfdemParticle/etc/bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export CFDEM_LIB_COMP_NAME=lagrangianCFDEMcomp-$CFDEM_VERSION-$WM_PROJECT_VERSIO

#check if additional libraries should be compiled together with solvers
if [[ $CFDEM_ADD_LIBS_NAME == "" ]]; then
export CFDEM_ADD_LIBS_NAME=additionalLibs_$WM_PROJECT_VERSION
export ADD_LIB_VERSION=$(echo $WM_PROJECT_VERSION | head -c 3)
export CFDEM_ADD_LIBS_NAME=additionalLibs_$ADD_LIB_VERSION
echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME ."
else
echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME defined by user."
Expand Down Expand Up @@ -240,9 +241,9 @@ else
fi

# detect OF version
if [ $WM_PROJECT_VERSION == "3.0.x" ]; then
if [ $WM_PROJECT_VERSION == "3.0.x" ] || [ $WM_PROJECT_VERSION == "3.0.0" ] || [ $WM_PROJECT_VERSION == "3.0.1" ]; then
export CFDEM_WM_PROJECT_VERSION=30
elif [ $WM_PROJECT_VERSION == "2.4.x" ]; then
elif [ $WM_PROJECT_VERSION == "2.4.x" ] || [ $WM_PROJECT_VERSION == "2.4.0" ]; then
export CFDEM_WM_PROJECT_VERSION=24
elif [[ $WM_PROJECT_VERSION == "3.2" && $WM_FORK == "extend" ]]; then
export CFDEM_WM_PROJECT_VERSION=132
Expand Down