From a240efea7c0c0d10f9c2fc8b207fdc89923c9c91 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 4 Nov 2025 07:55:42 +0100 Subject: [PATCH 1/4] Reenable daisy workflow --- .daisy/workflow-openfoam.yml | 75 ++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .daisy/workflow-openfoam.yml diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml new file mode 100644 index 0000000000..78583be5d4 --- /dev/null +++ b/.daisy/workflow-openfoam.yml @@ -0,0 +1,75 @@ +on: + pull_request: + types: [opened, reopened, synchronize, ready_for_review] + +parameters: + timeout: 360 + partitions: + - chamomile + +steps: + build: | + + sudo apt-get update + sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex + sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev + + export WM_PROJECT_DIR=`pwd` + . etc/custom_bashrc + ./wmake/wmakeLnIncludeAll + + ./Allwmake -j128 + + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity + ${FOAM_APPBIN}/blockMesh + cd ${WM_PROJECT_DIR} + + run: + cavity: + command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity + measurements: 5 + profiler: perf + env: + FOAM_APP: "/workspace/applications" + FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" + FOAM_INST_DIR: "/" + FOAM_LIBBIN: "/workspace/platforms/linux64GccSPInt32Opt/lib" + FOAM_MODULES: "/workspace/applications/modules" + FOAM_MPI: "openmpi-system" + FOAM_PROJECT_DIR: "/workspace" + FOAM_SOLVERS: "/workspace/applications/solvers" + FOAM_SRC: "/workspace/src" + FOAM_TUTORIALS: "/workspace/tutorials" + FOAM_USER_APPBIN: "/platforms/linux64GccSPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccSPInt32Opt/lib" + FOAM_UTILITIES: "/workspace/applications/utilities" + WM_ARCH: "linux64" + WM_ARCH_OPTION: "64" + WM_CC: "gcc" + WM_CFLAGS: "-m64 -fPIC -g" + WM_COMPILER: "Gcc" + WM_COMPILER_LIB_ARCH: "64" + WM_COMPILE_OPTION: "Opt" + WM_CXX: "g++" + WM_CXXFLAGS: "-m64 -fPIC -std: c++0x -g" + WM_DIR: "/workspace/wmake" + WM_LABEL_OPTION: "Int32" + WM_LABEL_SIZE: "32" + WM_LDFLAGS: "-m64" + WM_LINK_LANGUAGE: "c++" + WM_MPLIB: NONE #"SYSTEMOPENMPI" + WM_OPTIONS: "linux64GccSPInt32Opt" + WM_OSTYPE: "POSIX" + WM_PRECISION_OPTION: "SP" + WM_PROJECT: "OpenFOAM" + WM_PROJECT_DIR: "/workspace" + WM_PROJECT_INST_DIR: "/" + WM_THIRD_PARTY_DIR: "/workspace/ThirdParty-dev" + SCOTCH_TYPE: none #ThirdParty + METIS_TYPE: none + PARMETIS_TYPE: none + ZOLTAN_TYPE: none #ThirdParty + PATH: $PATH:/workspace/wmake + 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 + LIBRARY_PATH: /usr/local/lib From 458a0b9b29adcb576af1caa4a5aa2bd9f7e0e9ee Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 4 Nov 2025 08:02:30 +0100 Subject: [PATCH 2/4] Revert "Remove propeller case" This reverts commit 2b92a783fd3344ad2ccd0f50d99c3a02fcb975e2. --- .daisy/workflow-openfoam.yml | 61 +++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 78583be5d4..c912b6aebe 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -5,14 +5,14 @@ on: parameters: timeout: 360 partitions: - - chamomile + - zinnia steps: build: | - sudo apt-get update - sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex - sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev + apt-get update + apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex + apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev export WM_PROJECT_DIR=`pwd` . etc/custom_bashrc @@ -20,30 +20,35 @@ steps: ./Allwmake -j128 - cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller + cp ${FOAM_TUTORIALS}/resources/geometry/propeller*.obj.gz constant/geometry/ ${FOAM_APPBIN}/blockMesh + ${FOAM_APPBIN}/surfaceFeatures + ${FOAM_APPBIN}/snappyHexMesh -overwrite + ${FOAM_APPBIN}/createBaffles -overwrite + ${FOAM_APPBIN}/splitBaffles -overwrite + ${FOAM_APPBIN}/renumberMesh -noFields -overwrite + ${FOAM_APPBIN}/createNonConformalCouples -overwrite nonCouple1 nonCouple2 cd ${WM_PROJECT_DIR} run: - cavity: - command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity - measurements: 5 - profiler: perf + propeller: + command: $WM_PROJECT_DIR/bin/foamRun -case $WM_PROJECT_DIR/tutorials/incompressibleFluid/propeller env: - FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" + FOAM_APP: "$WM_PROJECT_DIR/applications" + FOAM_APPBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/bin" + FOAM_EXT_LIBBIN: "$WM_PROJECT_DIR/ThirdParty-dev/platforms/linux64GccDPInt32/lib" FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccSPInt32Opt/lib" - FOAM_MODULES: "/workspace/applications/modules" + FOAM_LIBBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/lib" + FOAM_MODULES: "$WM_PROJECT_DIR/applications/modules" FOAM_MPI: "openmpi-system" - FOAM_PROJECT_DIR: "/workspace" - FOAM_SOLVERS: "/workspace/applications/solvers" - FOAM_SRC: "/workspace/src" - FOAM_TUTORIALS: "/workspace/tutorials" - FOAM_USER_APPBIN: "/platforms/linux64GccSPInt32Opt/bin" - FOAM_USER_LIBBIN: "/platforms/linux64GccSPInt32Opt/lib" - FOAM_UTILITIES: "/workspace/applications/utilities" + FOAM_PROJECT_DIR: "$WM_PROJECT_DIR" + FOAM_SOLVERS: "$WM_PROJECT_DIR/applications/solvers" + FOAM_SRC: "$WM_PROJECT_DIR/src" + FOAM_TUTORIALS: "$WM_PROJECT_DIR/tutorials" + FOAM_USER_APPBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/bin" + FOAM_USER_LIBBIN: "$WM_PROJECT_DIR/platforms/linux64GccDPInt32Opt/lib" + FOAM_UTILITIES: "$WM_PROJECT_DIR/applications/utilities" WM_ARCH: "linux64" WM_ARCH_OPTION: "64" WM_CC: "gcc" @@ -53,23 +58,23 @@ steps: WM_COMPILE_OPTION: "Opt" WM_CXX: "g++" WM_CXXFLAGS: "-m64 -fPIC -std: c++0x -g" - WM_DIR: "/workspace/wmake" + WM_DIR: "$WM_PROJECT_DIR/wmake" WM_LABEL_OPTION: "Int32" WM_LABEL_SIZE: "32" WM_LDFLAGS: "-m64" WM_LINK_LANGUAGE: "c++" - WM_MPLIB: NONE #"SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccSPInt32Opt" + WM_MPLIB: "SYSTEMOPENMPI" + WM_OPTIONS: "linux64GccDPInt32Opt" WM_OSTYPE: "POSIX" - WM_PRECISION_OPTION: "SP" + WM_PRECISION_OPTION: "DP" WM_PROJECT: "OpenFOAM" WM_PROJECT_DIR: "/workspace" WM_PROJECT_INST_DIR: "/" - WM_THIRD_PARTY_DIR: "/workspace/ThirdParty-dev" + WM_THIRD_PARTY_DIR: "$WM_PROJECT_DIR/ThirdParty-dev" SCOTCH_TYPE: none #ThirdParty METIS_TYPE: none PARMETIS_TYPE: none ZOLTAN_TYPE: none #ThirdParty PATH: $PATH:/workspace/wmake - 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 - LIBRARY_PATH: /usr/local/lib + 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 + \ No newline at end of file From 6eb049922de5b558c20241b4b9298d2e62343049 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 4 Nov 2025 14:57:08 +0100 Subject: [PATCH 3/4] Write preprocessing to dev null --- .daisy/workflow-openfoam.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index c912b6aebe..f9d6f9e03f 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -18,17 +18,17 @@ steps: . etc/custom_bashrc ./wmake/wmakeLnIncludeAll - ./Allwmake -j128 + ./Allwmake -j128 >>/dev/null 2>&1 cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller cp ${FOAM_TUTORIALS}/resources/geometry/propeller*.obj.gz constant/geometry/ ${FOAM_APPBIN}/blockMesh ${FOAM_APPBIN}/surfaceFeatures - ${FOAM_APPBIN}/snappyHexMesh -overwrite - ${FOAM_APPBIN}/createBaffles -overwrite - ${FOAM_APPBIN}/splitBaffles -overwrite - ${FOAM_APPBIN}/renumberMesh -noFields -overwrite - ${FOAM_APPBIN}/createNonConformalCouples -overwrite nonCouple1 nonCouple2 + ${FOAM_APPBIN}/snappyHexMesh -overwrite >>/dev/null 2>&1 + ${FOAM_APPBIN}/createBaffles -overwrite >>/dev/null 2>&1 + ${FOAM_APPBIN}/splitBaffles -overwrite >>/dev/null 2>&1 + ${FOAM_APPBIN}/renumberMesh -noFields -overwrite >>/dev/null 2>&1 + ${FOAM_APPBIN}/createNonConformalCouples -overwrite nonCouple1 nonCouple2 >>/dev/null 2>&1 cd ${WM_PROJECT_DIR} run: From 050e9c3979e4d39960bf353a0d46a7da5a74e999 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 4 Nov 2025 16:24:51 +0100 Subject: [PATCH 4/4] Change library path --- .daisy/workflow-openfoam.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index f9d6f9e03f..23ccb05817 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -75,6 +75,5 @@ steps: METIS_TYPE: none PARMETIS_TYPE: none ZOLTAN_TYPE: none #ThirdParty - PATH: $PATH:/workspace/wmake - 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 - \ No newline at end of file + LD_LIBRARY_PATH: $WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib:$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib/dummy:$LD_LIBRARY_PATH + LIBRARY_PATH: $LD_LIBRARY_PATH:/usr/local/lib \ No newline at end of file