Skip to content

Commit d0748fe

Browse files
committed
Revert "Remove propeller case"
This reverts commit 2b92a78.
1 parent a240efe commit d0748fe

1 file changed

Lines changed: 30 additions & 25 deletions

File tree

.daisy/workflow-openfoam.yml

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
parameters:
66
timeout: 360
77
partitions:
8-
- chamomile
8+
- zinnia
99

1010
steps:
1111
build: |
@@ -20,30 +20,35 @@ steps:
2020
2121
./Allwmake -j128
2222
23-
cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity
23+
cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller
24+
cp ${FOAM_TUTORIALS}/resources/geometry/propeller*.obj.gz constant/geometry/
2425
${FOAM_APPBIN}/blockMesh
26+
${FOAM_APPBIN}/surfaceFeatures
27+
${FOAM_APPBIN}/snappyHexMesh -overwrite
28+
${FOAM_APPBIN}/createBaffles -overwrite
29+
${FOAM_APPBIN}/splitBaffles -overwrite
30+
${FOAM_APPBIN}/renumberMesh -noFields -overwrite
31+
${FOAM_APPBIN}/createNonConformalCouples -overwrite nonCouple1 nonCouple2
2532
cd ${WM_PROJECT_DIR}
2633
2734
run:
28-
cavity:
29-
command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity
30-
measurements: 5
31-
profiler: perf
35+
propeller:
36+
command: $WM_PROJECT_DIR/bin/foamRun -case $WM_PROJECT_DIR/tutorials/incompressibleFluid/propeller
3237
env:
33-
FOAM_APP: "/workspace/applications"
34-
FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin"
35-
FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib"
38+
FOAM_APP: "$WM_PROJECT_DIR/applications"
39+
FOAM_APPBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/bin"
40+
FOAM_EXT_LIBBIN: "$WM_PROJECT_DIR/ThirdParty-dev/platforms/linux64GccDPInt32/lib"
3641
FOAM_INST_DIR: "/"
37-
FOAM_LIBBIN: "/workspace/platforms/linux64GccSPInt32Opt/lib"
38-
FOAM_MODULES: "/workspace/applications/modules"
42+
FOAM_LIBBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/lib"
43+
FOAM_MODULES: "$WM_PROJECT_DIR/applications/modules"
3944
FOAM_MPI: "openmpi-system"
40-
FOAM_PROJECT_DIR: "/workspace"
41-
FOAM_SOLVERS: "/workspace/applications/solvers"
42-
FOAM_SRC: "/workspace/src"
43-
FOAM_TUTORIALS: "/workspace/tutorials"
44-
FOAM_USER_APPBIN: "/platforms/linux64GccSPInt32Opt/bin"
45-
FOAM_USER_LIBBIN: "/platforms/linux64GccSPInt32Opt/lib"
46-
FOAM_UTILITIES: "/workspace/applications/utilities"
45+
FOAM_PROJECT_DIR: "$WM_PROJECT_DIR"
46+
FOAM_SOLVERS: "$WM_PROJECT_DIR/applications/solvers"
47+
FOAM_SRC: "$WM_PROJECT_DIR/src"
48+
FOAM_TUTORIALS: "$WM_PROJECT_DIR/tutorials"
49+
FOAM_USER_APPBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/bin"
50+
FOAM_USER_LIBBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/lib"
51+
FOAM_UTILITIES: "$WM_PROJECT_DIR/applications/utilities"
4752
WM_ARCH: "linux64"
4853
WM_ARCH_OPTION: "64"
4954
WM_CC: "gcc"
@@ -53,23 +58,23 @@ steps:
5358
WM_COMPILE_OPTION: "Opt"
5459
WM_CXX: "g++"
5560
WM_CXXFLAGS: "-m64 -fPIC -std: c++0x -g"
56-
WM_DIR: "/workspace/wmake"
61+
WM_DIR: "$WM_PROJECT_DIR/wmake"
5762
WM_LABEL_OPTION: "Int32"
5863
WM_LABEL_SIZE: "32"
5964
WM_LDFLAGS: "-m64"
6065
WM_LINK_LANGUAGE: "c++"
61-
WM_MPLIB: NONE #"SYSTEMOPENMPI"
62-
WM_OPTIONS: "linux64GccSPInt32Opt"
66+
WM_MPLIB: "SYSTEMOPENMPI"
67+
WM_OPTIONS: "linux64GccDPInt32Opt"
6368
WM_OSTYPE: "POSIX"
64-
WM_PRECISION_OPTION: "SP"
69+
WM_PRECISION_OPTION: "DP"
6570
WM_PROJECT: "OpenFOAM"
6671
WM_PROJECT_DIR: "/workspace"
6772
WM_PROJECT_INST_DIR: "/"
68-
WM_THIRD_PARTY_DIR: "/workspace/ThirdParty-dev"
73+
WM_THIRD_PARTY_DIR: "$WM_PROJECT_DIR/ThirdParty-dev"
6974
SCOTCH_TYPE: none #ThirdParty
7075
METIS_TYPE: none
7176
PARMETIS_TYPE: none
7277
ZOLTAN_TYPE: none #ThirdParty
7378
PATH: $PATH:/workspace/wmake
74-
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
75-
LIBRARY_PATH: /usr/local/lib
79+
LD_LIBRARY_PATH: $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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system
80+

0 commit comments

Comments
 (0)