Skip to content

Commit c53d36d

Browse files
committed
Extracted WM_PROJECT_DIR env var from setup script to have that customizable. Workflow sets it to the previous value.
1 parent 7aac6f0 commit c53d36d

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

.daisy/workflow-openfoam.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ steps:
1414
sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex
1515
sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev
1616
17+
export WM_PROJECT_DIR=`pwd`
1718
. etc/custom_bashrc
1819
./wmake/wmakeLnIncludeAll
1920

etc/custom_bashrc

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
export FOAM_APP="/workspace/applications"
2-
export FOAM_APPBIN="/workspace/platforms/linux64GccSPInt32Opt/bin"
3-
export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib"
1+
2+
3+
export FOAM_APP="$WM_PROJECT_DIR/applications"
4+
export FOAM_APPBIN="$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/bin"
5+
export FOAM_EXT_LIBBIN="$WM_PROJECT_DIR/ThirdParty-dev/platforms/linux64GccSPInt32/lib"
46
export FOAM_INST_DIR="/"
5-
export FOAM_LIBBIN="/workspace/platforms/linux64GccSPInt32Opt/lib"
6-
export FOAM_MODULES="/workspace/applications/modules"
7+
export FOAM_LIBBIN="$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib"
8+
export FOAM_MODULES="$WM_PROJECT_DIR/applications/modules"
79
export FOAM_MPI="openmpi-system"
8-
export FOAM_PROJECT_DIR="/workspace"
9-
export FOAM_SOLVERS="/workspace/applications/solvers"
10-
export FOAM_SRC="/workspace/src"
11-
export FOAM_TUTORIALS="/workspace/tutorials"
10+
export FOAM_PROJECT_DIR="$WM_PROJECT_DIR"
11+
export FOAM_SOLVERS="$WM_PROJECT_DIR/applications/solvers"
12+
export FOAM_SRC="$WM_PROJECT_DIR/src"
13+
export FOAM_TUTORIALS="$WM_PROJECT_DIR/tutorials"
1214
export FOAM_USER_APPBIN="/platforms/linux64GccSPInt32Opt/bin"
1315
export FOAM_USER_LIBBIN="/platforms/linux64GccSPInt32Opt/lib"
14-
export FOAM_UTILITIES="/workspace/applications/utilities"
16+
export FOAM_UTILITIES="$WM_PROJECT_DIR/applications/utilities"
1517

1618
export WM_ARCH="linux64"
1719
export WM_ARCH_OPTION="64"
@@ -22,7 +24,7 @@
2224
export WM_COMPILE_OPTION="Opt"
2325
export WM_CXX="g++"
2426
export WM_CXXFLAGS="-m64 -fPIC -std=c++0x -g"
25-
export WM_DIR="/workspace/wmake"
27+
export WM_DIR="$WM_PROJECT_DIR/wmake"
2628
export WM_LABEL_OPTION="Int32"
2729
export WM_LABEL_SIZE="32"
2830
export WM_LDFLAGS="-m64"
@@ -32,9 +34,8 @@
3234
export WM_OSTYPE="POSIX"
3335
export WM_PRECISION_OPTION="SP"
3436
export WM_PROJECT="OpenFOAM"
35-
export WM_PROJECT_DIR="/workspace"
3637
export WM_PROJECT_INST_DIR="/"
37-
export WM_THIRD_PARTY_DIR="/workspace/ThirdParty-dev"
38+
export WM_THIRD_PARTY_DIR="$WM_PROJECT_DIR/ThirdParty-dev"
3839

3940
export SCOTCH_TYPE=none #ThirdParty
4041
export METIS_TYPE=none
@@ -43,5 +44,5 @@
4344

4445

4546
export PATH=$PATH:$WM_PROJECT_DIR/wmake
46-
export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64:/usr/local/papi/lib:/usr/local/cuda-12.8/lib64:/workspace/platforms/linux64GccSPInt32Opt/lib:/workspace/platforms/linux64GccSPInt32Opt/lib/dummy
47+
export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64:/usr/local/papi/lib:/usr/local/cuda-12.8/lib64:$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib:$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib/dummy
4748
export LIBRARY_PATH=/usr/local/lib

0 commit comments

Comments
 (0)