From 22e6f9f2ac548ee09c34fe1a41b885133fe65122 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Sun, 4 May 2025 14:39:09 +0200 Subject: [PATCH 01/20] Add submodule --- .gitmodules | 3 +++ ThirdParty-dev | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 ThirdParty-dev diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..9fe2969c35 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ThirdParty-dev"] + path = ThirdParty-dev + url = https://github.com/OpenFOAM/ThirdParty-dev.git diff --git a/ThirdParty-dev b/ThirdParty-dev new file mode 160000 index 0000000000..cda87f9aca --- /dev/null +++ b/ThirdParty-dev @@ -0,0 +1 @@ +Subproject commit cda87f9acaca25952d17d96140fb9662c19642f2 From 6a343d2bc6feba015f6b78c484b5d0df5e7d41d5 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Sun, 4 May 2025 15:12:21 +0200 Subject: [PATCH 02/20] Make propeller run shorter --- tutorials/incompressibleFluid/propeller/system/controlDict | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/incompressibleFluid/propeller/system/controlDict b/tutorials/incompressibleFluid/propeller/system/controlDict index c3b09d08ac..5464ccbae5 100644 --- a/tutorials/incompressibleFluid/propeller/system/controlDict +++ b/tutorials/incompressibleFluid/propeller/system/controlDict @@ -22,7 +22,7 @@ startTime 0; stopAt endTime; -endTime 0.1; +endTime 0.01; deltaT 1e-5; writeControl adjustableRunTime; From fa22c3748feeb4f1df80fc903560abe1217aac1f Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Sun, 4 May 2025 14:39:56 +0200 Subject: [PATCH 03/20] Add workflow and deactivate parallel build --- .daisy/workflow-openfoam.yml | 56 ++++++++++++++++++++++++++++++++++++ etc/bashrc | 14 +++++---- 2 files changed, 65 insertions(+), 5 deletions(-) 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..48b80849e0 --- /dev/null +++ b/.daisy/workflow-openfoam.yml @@ -0,0 +1,56 @@ +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 + sudo apt-get install -y libdouble-conversion-dev libfreetype-dev libqt5svg5-dev qtxmlpatterns5-dev-tools qttools5-dev python3-dev + + export FOAM_VERBOSE=1 + echo ${PWD} + . etc/bashrc + ./Allwmake -j20 + + . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions + + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity + runApplication blockMesh + cd ${WM_PROJECT_DIR} + + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D + runApplication blockMesh + cd ${WM_PROJECT_DIR} + + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller + cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ + runApplication blockMesh + runApplication surfaceFeatures + runApplication snappyHexMesh -overwrite + runApplication createBaffles -overwrite + runApplication splitBaffles -overwrite + runApplication renumberMesh -noFields -overwrite + runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2 + cd ${WM_PROJECT_DIR} + + + run: + cavity: + command: /bin/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/cavity + measurements: 1 + profiler: perf + rotor2d: + command: /bin/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/rotor2D + measurements: 1 + profiler: perf + #propeller: + #command: /bin/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/propeller + #measurements: 1 + #profiler: perf diff --git a/etc/bashrc b/etc/bashrc index ab3da4c50d..960cd03774 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -33,7 +33,7 @@ export WM_PROJECT=OpenFOAM export WM_THIRD_PARTY=ThirdParty -export WM_PROJECT_VERSION=dev +export WM_PROJECT_VERSION=dash ################################################################################ # USER EDITABLE PART: Changes made here may be lost with the next upgrade @@ -48,9 +48,11 @@ if [ -n "$bashrcFile" ] then export FOAM_INST_DIR=$(cd $(dirname $bashrcFile)/../.. && pwd -P) else - export FOAM_INST_DIR=$HOME/$WM_PROJECT + export FOAM_INST_DIR=$(cd $(dirname $0)/.. && pwd -P) + export FOAM_PROJECT_DIR=$(cd $(dirname $0) && pwd -P) fi unset bashrcFile +echo ${FOAM_INST_DIR} # # Please set to the appropriate path if the above default is not correct. E.g., # @@ -103,10 +105,10 @@ export WM_OSTYPE=POSIX #- Decomposition libraries: # _TYPE = none | system | ThirdParty (OpenFOAM) -export SCOTCH_TYPE=ThirdParty +export SCOTCH_TYPE=none #ThirdParty export METIS_TYPE=none export PARMETIS_TYPE=none -export ZOLTAN_TYPE=ThirdParty +export ZOLTAN_TYPE=none #ThirdParty # ParaView_TYPE = none | system | paraviewopenfoam | ThirdParty (OpenFOAM) export ParaView_TYPE=system @@ -130,8 +132,10 @@ foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \ # Location of installation # ~~~~~~~~~~~~~~~~~~~~~~~~ export WM_PROJECT_INST_DIR=$FOAM_INST_DIR -export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION +export WM_PROJECT_DIR=$FOAM_PROJECT_DIR + #$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION +echo $WM_PROJECT_DIR if [ -d "$WM_PROJECT_DIR" ] then WM_PROJECT_DIR_REAL=$(cd $WM_PROJECT_DIR && pwd -P) From d28a836982e890a0cfed14f8778fc2ee89f1c0c6 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 6 May 2025 11:53:00 +0200 Subject: [PATCH 04/20] Change to custom buildfile --- .daisy/workflow-openfoam.yml | 45 ++++++++++++----------- applications/solvers/foamRun/Make/files | 2 +- etc/custom_bashrc | 47 +++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 24 deletions(-) create mode 100644 etc/custom_bashrc diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 48b80849e0..63b45a9151 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -5,52 +5,51 @@ on: parameters: timeout: 360 partitions: - - chamomile + - zinnia-ci 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 build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex openmpi-common sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev - sudo apt-get install -y libdouble-conversion-dev libfreetype-dev libqt5svg5-dev qtxmlpatterns5-dev-tools qttools5-dev python3-dev + #sudo apt-get install -y libdouble-conversion-dev libfreetype-dev libqt5svg5-dev qtxmlpatterns5-dev-tools qttools5-dev python3-dev - export FOAM_VERBOSE=1 - echo ${PWD} - . etc/bashrc - ./Allwmake -j20 + . etc/custom_bashrc - . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions + ./wmake/wmakeLnIncludeAll + + ./Allwmake -j128 cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity - runApplication blockMesh + $FOAM_APPBIN/blockMesh cd ${WM_PROJECT_DIR} cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D - runApplication blockMesh + $FOAM_APPBIN/blockMesh cd ${WM_PROJECT_DIR} cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ - runApplication blockMesh - runApplication surfaceFeatures - runApplication snappyHexMesh -overwrite - runApplication createBaffles -overwrite - runApplication splitBaffles -overwrite - runApplication renumberMesh -noFields -overwrite - runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2 + $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/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/cavity + command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity measurements: 1 profiler: perf rotor2d: - command: /bin/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/rotor2D + command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D + measurements: 1 + profiler: perf + propeller: + command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller measurements: 1 profiler: perf - #propeller: - #command: /bin/bash etc/bashrc && foamRun -case ./tutorials/incompressibleFluid/propeller - #measurements: 1 - #profiler: perf diff --git a/applications/solvers/foamRun/Make/files b/applications/solvers/foamRun/Make/files index 2b1fee90a9..49a77cadbe 100644 --- a/applications/solvers/foamRun/Make/files +++ b/applications/solvers/foamRun/Make/files @@ -1,4 +1,4 @@ setDeltaT.C foamRun.C -EXE = $(FOAM_APPBIN)/foamRun +EXE = $(WM_PROJECT_DIR)/bin/foamRun diff --git a/etc/custom_bashrc b/etc/custom_bashrc new file mode 100644 index 0000000000..0fa89bda93 --- /dev/null +++ b/etc/custom_bashrc @@ -0,0 +1,47 @@ + export FOAM_APP="/workspace/applications" + export FOAM_APPBIN="/workspace/platforms/linux64GccDPInt32Opt/bin" + export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + export FOAM_INST_DIR="/" + export FOAM_LIBBIN="/workspace/platforms/linux64GccDPInt32Opt/lib" + export FOAM_MODULES="/workspace/applications/modules" + export FOAM_MPI="openmpi-system" + export FOAM_PROJECT_DIR="/workspace" + export FOAM_SOLVERS="/workspace/applications/solvers" + export FOAM_SRC="/workspace/src" + export FOAM_TUTORIALS="/workspace/tutorials" + export FOAM_USER_APPBIN="/platforms/linux64GccDPInt32Opt/bin" + export FOAM_USER_LIBBIN="/platforms/linux64GccDPInt32Opt/lib" + export FOAM_UTILITIES="/workspace/applications/utilities" + + export WM_ARCH="linux64" + export WM_ARCH_OPTION="64" + export WM_CC="gcc" + export WM_CFLAGS="-m64 -fPIC -g" + export WM_COMPILER="Gcc" + export WM_COMPILER_LIB_ARCH="64" + export WM_COMPILE_OPTION="Opt" + export WM_CXX="g++" + export WM_CXXFLAGS="-m64 -fPIC -std=c++0x -g" + export WM_DIR="/workspace/wmake" + export WM_LABEL_OPTION="Int32" + export WM_LABEL_SIZE="32" + export WM_LDFLAGS="-m64" + export WM_LINK_LANGUAGE="c++" + export WM_MPLIB="SYSTEMOPENMPI" + export WM_OPTIONS="linux64GccDPInt32Opt" + export WM_OSTYPE="POSIX" + export WM_PRECISION_OPTION="DP" + export WM_PROJECT="OpenFOAM" + export WM_PROJECT_DIR="/workspace" + export WM_PROJECT_INST_DIR="/" + export WM_THIRD_PARTY_DIR="/workspace/ThirdParty-dev" + + export SCOTCH_TYPE=none #ThirdParty + export METIS_TYPE=none + export PARMETIS_TYPE=none + export ZOLTAN_TYPE=none #ThirdParty + + + export PATH=$PATH:$WM_PROJECT_DIR/wmake + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + export LIBRARY_PATH=/usr/local/lib From 4494de394dd2afa3611d841bec5425cf94ef9953 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 7 May 2025 11:49:25 +0200 Subject: [PATCH 05/20] Add env variables --- .daisy/workflow-openfoam.yml | 91 ++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 25 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 63b45a9151..6315682812 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -5,17 +5,14 @@ on: parameters: timeout: 360 partitions: - - zinnia-ci + - 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 openmpi-common sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev - #sudo apt-get install -y libdouble-conversion-dev libfreetype-dev libqt5svg5-dev qtxmlpatterns5-dev-tools qttools5-dev python3-dev - . etc/custom_bashrc - ./wmake/wmakeLnIncludeAll ./Allwmake -j128 @@ -24,20 +21,20 @@ steps: $FOAM_APPBIN/blockMesh cd ${WM_PROJECT_DIR} - cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D - $FOAM_APPBIN/blockMesh - cd ${WM_PROJECT_DIR} + #cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D + #$FOAM_APPBIN/blockMesh + #cd ${WM_PROJECT_DIR} - 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} + #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: @@ -45,11 +42,55 @@ steps: command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity measurements: 1 profiler: perf - rotor2d: - command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D - measurements: 1 - profiler: perf - propeller: - command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller - measurements: 1 - profiler: perf + env: + FOAM_APP: "/workspace/applications" + FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + FOAM_INST_DIR: "/" + FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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/linux64GccDPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/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: "SYSTEMOPENMPI" + WM_OPTIONS: "linux64GccDPInt32Opt" + WM_OSTYPE: "POSIX" + WM_PRECISION_OPTION: "DP" + 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:$WM_PROJECT_DIR/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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + LIBRARY_PATH: /usr/local/lib + #rotor2d: + #command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D + #measurements: 1 + #profiler: perf + #propeller: + #command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller + #measurements: 1 + #profiler: perf From e9686301ff4bd0b1953b942fbcafab998d4cbeef Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 7 May 2025 12:15:52 +0200 Subject: [PATCH 06/20] TEMP Debug env --- .daisy/workflow-openfoam.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 6315682812..50cb6fe829 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -9,6 +9,10 @@ parameters: steps: build: | + + env + + echo $PATH sudo apt-get update sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex openmpi-common sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev @@ -83,7 +87,7 @@ steps: METIS_TYPE: none PARMETIS_TYPE: none ZOLTAN_TYPE: none #ThirdParty - PATH: $PATH:$WM_PROJECT_DIR/wmake + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system LIBRARY_PATH: /usr/local/lib #rotor2d: From 1cf352a5b5de5bfb805d0b4f7bb216677ad28341 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 7 May 2025 13:36:27 +0200 Subject: [PATCH 07/20] Change flow --- .daisy/workflow-openfoam.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 50cb6fe829..758a4a56ba 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -16,7 +16,8 @@ steps: sudo apt-get update sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex openmpi-common sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev - + + . etc/custom_bashrc ./wmake/wmakeLnIncludeAll ./Allwmake -j128 From 00122842500911d937c2fc7caf63c111e2eb5f71 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 7 May 2025 16:28:02 +0200 Subject: [PATCH 08/20] Add benchmark and change partition --- .daisy/workflow-openfoam.yml | 80 +++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 28 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 758a4a56ba..b48e43feb0 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -5,14 +5,11 @@ on: parameters: timeout: 360 partitions: - - chamomile + - zinnia steps: build: | - env - - echo $PATH sudo apt-get update sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex openmpi-common sudo apt-get install -y libxml2-dev libhdf5-dev libavfilter-dev libtheora-dev libgl2ps-dev libx11-dev libqt5x11extras5-dev libglew-dev libutfcpp-dev @@ -26,24 +23,12 @@ steps: $FOAM_APPBIN/blockMesh cd ${WM_PROJECT_DIR} - #cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D - #$FOAM_APPBIN/blockMesh - #cd ${WM_PROJECT_DIR} - - #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} + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D + $FOAM_APPBIN/blockMesh + cd ${WM_PROJECT_DIR} - run: - cavity: + rotor2d: command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity measurements: 1 profiler: perf @@ -91,11 +76,50 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system LIBRARY_PATH: /usr/local/lib - #rotor2d: - #command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D - #measurements: 1 - #profiler: perf - #propeller: - #command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller - #measurements: 1 - #profiler: perf + rotor2d: + command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D + measurements: 1 + profiler: perf + env: + FOAM_APP: "/workspace/applications" + FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + FOAM_INST_DIR: "/" + FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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/linux64GccDPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/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: "SYSTEMOPENMPI" + WM_OPTIONS: "linux64GccDPInt32Opt" + WM_OSTYPE: "POSIX" + WM_PRECISION_OPTION: "DP" + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system From cbc0d3a052c3d314ea037888472df259da8bf0ae Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Thu, 8 May 2025 17:37:31 +0200 Subject: [PATCH 09/20] Fix workflow --- .daisy/workflow-openfoam.yml | 62 ++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index b48e43feb0..f4f993309e 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -5,7 +5,7 @@ on: parameters: timeout: 360 partitions: - - zinnia + - chamomile steps: build: | @@ -26,9 +26,21 @@ steps: cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D $FOAM_APPBIN/blockMesh cd ${WM_PROJECT_DIR} + + cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller + cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ + runApplication blockMesh + runApplication surfaceFeatures + runApplication snappyHexMesh -overwrite + runApplication createBaffles -overwrite + runApplication splitBaffles -overwrite + runApplication renumberMesh -noFields -overwrite + runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2 + cd ${WM_PROJECT_DIR} + run: - rotor2d: + cavity: command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity measurements: 1 profiler: perf @@ -123,3 +135,49 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + propeller: + command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller + measurements: 1 + profiler: perf + env: + FOAM_APP: "/workspace/applications" + FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + FOAM_INST_DIR: "/" + FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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/linux64GccDPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/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: "SYSTEMOPENMPI" + WM_OPTIONS: "linux64GccDPInt32Opt" + WM_OSTYPE: "POSIX" + WM_PRECISION_OPTION: "DP" + 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 From 384b9fce5ad4adbfa129698a84f9684322bcea54 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Thu, 8 May 2025 23:36:15 +0200 Subject: [PATCH 10/20] Fix propeller preprocessing --- .daisy/workflow-openfoam.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index f4f993309e..0b14073ea5 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -20,22 +20,22 @@ steps: ./Allwmake -j128 cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/cavity - $FOAM_APPBIN/blockMesh + ${FOAM_APPBIN}/blockMesh cd ${WM_PROJECT_DIR} cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D - $FOAM_APPBIN/blockMesh + ${FOAM_APPBIN}/blockMesh cd ${WM_PROJECT_DIR} cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/propeller - cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ - runApplication blockMesh - runApplication surfaceFeatures - runApplication snappyHexMesh -overwrite - runApplication createBaffles -overwrite - runApplication splitBaffles -overwrite - runApplication renumberMesh -noFields -overwrite - runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2 + 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} @@ -181,3 +181,4 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system From fe9a30f67babff7cd02a0979e5073b08e1a0f1f4 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Fri, 9 May 2025 08:38:10 +0200 Subject: [PATCH 11/20] Change propeller processing to run serial --- tutorials/incompressibleFluid/propeller/Allmesh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tutorials/incompressibleFluid/propeller/Allmesh b/tutorials/incompressibleFluid/propeller/Allmesh index 8dbc8a79ed..0fe975aa4f 100755 --- a/tutorials/incompressibleFluid/propeller/Allmesh +++ b/tutorials/incompressibleFluid/propeller/Allmesh @@ -8,19 +8,19 @@ cd ${0%/*} || exit 1 # Run from this directory cp $FOAM_TUTORIALS/resources/geometry/propeller*.obj.gz constant/geometry/ # Mesh in parallel -runApplication blockMesh -runApplication surfaceFeatures -runApplication decomposePar -noFields -runParallel snappyHexMesh -overwrite +${FOAM_APPBIN}/blockMesh +${FOAM_APPBIN}/surfaceFeatures +${FOAM_APPBIN}/decomposePar -noFields +${FOAM_APPBIN}/snappyHexMesh -overwrite # Create the sliding patches -runParallel createBaffles -overwrite -runParallel splitBaffles -overwrite +${FOAM_APPBIN}/createBaffles -overwrite +${FOAM_APPBIN}/splitBaffles -overwrite # Renumber -runParallel renumberMesh -noFields -overwrite +${FOAM_APPBIN}/renumberMesh -noFields -overwrite # Create non-conformal couples -runParallel createNonConformalCouples -overwrite nonCouple1 nonCouple2 +${FOAM_APPBIN}/createNonConformalCouples -overwrite nonCouple1 nonCouple2 #------------------------------------------------------------------------------ From 2b92a783fd3344ad2ccd0f50d99c3a02fcb975e2 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Fri, 9 May 2025 11:35:59 +0200 Subject: [PATCH 12/20] Remove propeller case --- .daisy/workflow-openfoam.yml | 59 ------------------------------------ 1 file changed, 59 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 0b14073ea5..18dd3efd54 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -26,18 +26,6 @@ steps: cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D ${FOAM_APPBIN}/blockMesh cd ${WM_PROJECT_DIR} - - 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: @@ -135,50 +123,3 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system - propeller: - command: bin/foamRun -case ./tutorials/incompressibleFluid/propeller - measurements: 1 - profiler: perf - env: - FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" - FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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/linux64GccDPInt32Opt/bin" - FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/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: "SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccDPInt32Opt" - WM_OSTYPE: "POSIX" - WM_PRECISION_OPTION: "DP" - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system From 4733337c26ad8ed02b0abd962555ab23fe07b03c Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Mon, 14 Jul 2025 14:43:18 +0200 Subject: [PATCH 13/20] Build openfoam without mpi --- .daisy/workflow-openfoam.yml | 59 +++--------------------------------- etc/custom_bashrc | 4 +-- 2 files changed, 6 insertions(+), 57 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 18dd3efd54..38b6367d29 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -11,7 +11,7 @@ steps: build: | sudo apt-get update - sudo apt-get install -y build-essential libopenmpi-dev zlib1g-dev gnuplot gnuplot-x11 libxt-dev cmake flex openmpi-common + 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 . etc/custom_bashrc @@ -23,14 +23,10 @@ steps: ${FOAM_APPBIN}/blockMesh cd ${WM_PROJECT_DIR} - cd ${WM_PROJECT_DIR}/tutorials/incompressibleFluid/rotor2D - ${FOAM_APPBIN}/blockMesh - cd ${WM_PROJECT_DIR} - run: cavity: command: bin/foamRun -case ./tutorials/incompressibleFluid/cavity - measurements: 1 + measurements: 5 profiler: perf env: FOAM_APP: "/workspace/applications" @@ -61,7 +57,7 @@ steps: WM_LABEL_SIZE: "32" WM_LDFLAGS: "-m64" WM_LINK_LANGUAGE: "c++" - WM_MPLIB: "SYSTEMOPENMPI" + WM_MPLIB: NONE #"SYSTEMOPENMPI" WM_OPTIONS: "linux64GccDPInt32Opt" WM_OSTYPE: "POSIX" WM_PRECISION_OPTION: "DP" @@ -74,52 +70,5 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + 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/dummy LIBRARY_PATH: /usr/local/lib - rotor2d: - command: bin/foamRun -case ./tutorials/incompressibleFluid/rotor2D - measurements: 1 - profiler: perf - env: - FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" - FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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/linux64GccDPInt32Opt/bin" - FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/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: "SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccDPInt32Opt" - WM_OSTYPE: "POSIX" - WM_PRECISION_OPTION: "DP" - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 0fa89bda93..076911ff33 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -27,7 +27,7 @@ export WM_LABEL_SIZE="32" export WM_LDFLAGS="-m64" export WM_LINK_LANGUAGE="c++" - export WM_MPLIB="SYSTEMOPENMPI" + export WM_MPLIB=NONE #"SYSTEMOPENMPI" export WM_OPTIONS="linux64GccDPInt32Opt" export WM_OSTYPE="POSIX" export WM_PRECISION_OPTION="DP" @@ -43,5 +43,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy export LIBRARY_PATH=/usr/local/lib From bbe429f6a4b3b099d45c7079ac093cf0e4e51d4c Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Mon, 14 Jul 2025 20:50:18 +0200 Subject: [PATCH 14/20] Switch to SP --- .daisy/workflow-openfoam.yml | 16 ++++++++-------- etc/bashrc | 6 +++--- etc/custom_bashrc | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 38b6367d29..ff63132830 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -30,18 +30,18 @@ steps: profiler: perf env: FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/lib" + 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/linux64GccDPInt32Opt/bin" - FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/lib" + FOAM_USER_APPBIN: "/platforms/linux64GccSPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccSPInt32Opt/lib" FOAM_UTILITIES: "/workspace/applications/utilities" WM_ARCH: "linux64" WM_ARCH_OPTION: "64" @@ -58,9 +58,9 @@ steps: WM_LDFLAGS: "-m64" WM_LINK_LANGUAGE: "c++" WM_MPLIB: NONE #"SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccDPInt32Opt" + WM_OPTIONS: "linux64GccSPInt32Opt" WM_OSTYPE: "POSIX" - WM_PRECISION_OPTION: "DP" + WM_PRECISION_OPTION: "SP" WM_PROJECT: "OpenFOAM" WM_PROJECT_DIR: "/workspace" WM_PROJECT_INST_DIR: "/" @@ -70,5 +70,5 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy + 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 diff --git a/etc/bashrc b/etc/bashrc index 960cd03774..955c730ee6 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -84,7 +84,7 @@ export WM_ARCH_OPTION=64 #- Precision: # WM_PRECISION_OPTION = SP | DP | LP -export WM_PRECISION_OPTION=DP +export WM_PRECISION_OPTION=SP #- Label size: # WM_LABEL_SIZE = 32 | 64 @@ -97,7 +97,7 @@ export WM_COMPILE_OPTION=Opt #- MPI implementation: # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI # | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI -export WM_MPLIB=SYSTEMOPENMPI +export WM_MPLIB=NONE #SYSTEMOPENMPI #- Operating System: # WM_OSTYPE = POSIX | ??? @@ -111,7 +111,7 @@ export PARMETIS_TYPE=none export ZOLTAN_TYPE=none #ThirdParty # ParaView_TYPE = none | system | paraviewopenfoam | ThirdParty (OpenFOAM) -export ParaView_TYPE=system +export ParaView_TYPE=none #- Floating-point signal handling: # set or unset diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 076911ff33..3071f5e1a8 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -1,16 +1,16 @@ export FOAM_APP="/workspace/applications" - export FOAM_APPBIN="/workspace/platforms/linux64GccDPInt32Opt/bin" - export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + export FOAM_APPBIN="/workspace/platforms/linux64GccSPInt32Opt/bin" + export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" export FOAM_INST_DIR="/" - export FOAM_LIBBIN="/workspace/platforms/linux64GccDPInt32Opt/lib" + export FOAM_LIBBIN="/workspace/platforms/linux64GccSPInt32Opt/lib" export FOAM_MODULES="/workspace/applications/modules" export FOAM_MPI="openmpi-system" export FOAM_PROJECT_DIR="/workspace" export FOAM_SOLVERS="/workspace/applications/solvers" export FOAM_SRC="/workspace/src" export FOAM_TUTORIALS="/workspace/tutorials" - export FOAM_USER_APPBIN="/platforms/linux64GccDPInt32Opt/bin" - export FOAM_USER_LIBBIN="/platforms/linux64GccDPInt32Opt/lib" + export FOAM_USER_APPBIN="/platforms/linux64GccSPInt32Opt/bin" + export FOAM_USER_LIBBIN="/platforms/linux64GccSPInt32Opt/lib" export FOAM_UTILITIES="/workspace/applications/utilities" export WM_ARCH="linux64" @@ -28,9 +28,9 @@ export WM_LDFLAGS="-m64" export WM_LINK_LANGUAGE="c++" export WM_MPLIB=NONE #"SYSTEMOPENMPI" - export WM_OPTIONS="linux64GccDPInt32Opt" + export WM_OPTIONS="linux64GccSPInt32Opt" export WM_OSTYPE="POSIX" - export WM_PRECISION_OPTION="DP" + export WM_PRECISION_OPTION="SP" export WM_PROJECT="OpenFOAM" export WM_PROJECT_DIR="/workspace" export WM_PROJECT_INST_DIR="/" @@ -43,5 +43,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy + 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 export LIBRARY_PATH=/usr/local/lib From 2eea0ca41618c948cd9efbd2fc058b0c2fd4832a Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 15 Jul 2025 09:20:54 +0200 Subject: [PATCH 15/20] Revert "Switch to SP" This reverts commit 5ac4bb4edc382bcd060e714ccc95580bfa2f59a1. --- .daisy/workflow-openfoam.yml | 16 ++++++++-------- etc/bashrc | 6 +++--- etc/custom_bashrc | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index ff63132830..38b6367d29 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -30,18 +30,18 @@ steps: profiler: perf env: FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" + FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccSPInt32Opt/lib" + FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/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_USER_APPBIN: "/platforms/linux64GccDPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/lib" FOAM_UTILITIES: "/workspace/applications/utilities" WM_ARCH: "linux64" WM_ARCH_OPTION: "64" @@ -58,9 +58,9 @@ steps: WM_LDFLAGS: "-m64" WM_LINK_LANGUAGE: "c++" WM_MPLIB: NONE #"SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccSPInt32Opt" + 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: "/" @@ -70,5 +70,5 @@ steps: 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 + 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/dummy LIBRARY_PATH: /usr/local/lib diff --git a/etc/bashrc b/etc/bashrc index 955c730ee6..960cd03774 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -84,7 +84,7 @@ export WM_ARCH_OPTION=64 #- Precision: # WM_PRECISION_OPTION = SP | DP | LP -export WM_PRECISION_OPTION=SP +export WM_PRECISION_OPTION=DP #- Label size: # WM_LABEL_SIZE = 32 | 64 @@ -97,7 +97,7 @@ export WM_COMPILE_OPTION=Opt #- MPI implementation: # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI # | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI -export WM_MPLIB=NONE #SYSTEMOPENMPI +export WM_MPLIB=SYSTEMOPENMPI #- Operating System: # WM_OSTYPE = POSIX | ??? @@ -111,7 +111,7 @@ export PARMETIS_TYPE=none export ZOLTAN_TYPE=none #ThirdParty # ParaView_TYPE = none | system | paraviewopenfoam | ThirdParty (OpenFOAM) -export ParaView_TYPE=none +export ParaView_TYPE=system #- Floating-point signal handling: # set or unset diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 3071f5e1a8..0fa89bda93 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -1,16 +1,16 @@ export FOAM_APP="/workspace/applications" - export FOAM_APPBIN="/workspace/platforms/linux64GccSPInt32Opt/bin" - export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" + export FOAM_APPBIN="/workspace/platforms/linux64GccDPInt32Opt/bin" + export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" export FOAM_INST_DIR="/" - export FOAM_LIBBIN="/workspace/platforms/linux64GccSPInt32Opt/lib" + export FOAM_LIBBIN="/workspace/platforms/linux64GccDPInt32Opt/lib" export FOAM_MODULES="/workspace/applications/modules" export FOAM_MPI="openmpi-system" export FOAM_PROJECT_DIR="/workspace" export FOAM_SOLVERS="/workspace/applications/solvers" export FOAM_SRC="/workspace/src" export FOAM_TUTORIALS="/workspace/tutorials" - export FOAM_USER_APPBIN="/platforms/linux64GccSPInt32Opt/bin" - export FOAM_USER_LIBBIN="/platforms/linux64GccSPInt32Opt/lib" + export FOAM_USER_APPBIN="/platforms/linux64GccDPInt32Opt/bin" + export FOAM_USER_LIBBIN="/platforms/linux64GccDPInt32Opt/lib" export FOAM_UTILITIES="/workspace/applications/utilities" export WM_ARCH="linux64" @@ -27,10 +27,10 @@ export WM_LABEL_SIZE="32" export WM_LDFLAGS="-m64" export WM_LINK_LANGUAGE="c++" - export WM_MPLIB=NONE #"SYSTEMOPENMPI" - export WM_OPTIONS="linux64GccSPInt32Opt" + export WM_MPLIB="SYSTEMOPENMPI" + export WM_OPTIONS="linux64GccDPInt32Opt" export WM_OSTYPE="POSIX" - export WM_PRECISION_OPTION="SP" + export WM_PRECISION_OPTION="DP" export WM_PROJECT="OpenFOAM" export WM_PROJECT_DIR="/workspace" export WM_PROJECT_INST_DIR="/" @@ -43,5 +43,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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 + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system export LIBRARY_PATH=/usr/local/lib From e5c52fb0127034ec90a677fb0b4fb12e243677a5 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 15 Jul 2025 09:27:50 +0200 Subject: [PATCH 16/20] Donnot use mpi durign build --- etc/custom_bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 0fa89bda93..076911ff33 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -27,7 +27,7 @@ export WM_LABEL_SIZE="32" export WM_LDFLAGS="-m64" export WM_LINK_LANGUAGE="c++" - export WM_MPLIB="SYSTEMOPENMPI" + export WM_MPLIB=NONE #"SYSTEMOPENMPI" export WM_OPTIONS="linux64GccDPInt32Opt" export WM_OSTYPE="POSIX" export WM_PRECISION_OPTION="DP" @@ -43,5 +43,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/openmpi-system + 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy export LIBRARY_PATH=/usr/local/lib From b6a6da138932ce013d472d2acba64d832dda26e2 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 15 Jul 2025 10:37:20 +0200 Subject: [PATCH 17/20] Local changes --- applications/modules/compressibleVoF/alphaSuSp.C | 4 ++-- etc/bashrc | 13 +++++++------ .../solvers/scalarTransport/scalarTransport.C | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/applications/modules/compressibleVoF/alphaSuSp.C b/applications/modules/compressibleVoF/alphaSuSp.C index fdf6721aee..6260584b88 100644 --- a/applications/modules/compressibleVoF/alphaSuSp.C +++ b/applications/modules/compressibleVoF/alphaSuSp.C @@ -71,9 +71,9 @@ void Foam::solvers::compressibleVoF::alphaSuSp if (vDot[celli] > 0.0) { Sp[celli] -= - vDot[celli]/max(1.0 - alpha1[celli], vDotResidualAlpha); + vDot[celli]/max(scalar(1.0) - alpha1[celli], vDotResidualAlpha); Su[celli] += - vDot[celli]/max(1.0 - alpha1[celli], vDotResidualAlpha); + vDot[celli]/max(scalar(1.0) - alpha1[celli], vDotResidualAlpha); } else if (vDot[celli] < 0.0) { diff --git a/etc/bashrc b/etc/bashrc index 960cd03774..4e1d52555d 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -33,7 +33,7 @@ export WM_PROJECT=OpenFOAM export WM_THIRD_PARTY=ThirdParty -export WM_PROJECT_VERSION=dash +export WM_PROJECT_VERSION=dev ################################################################################ # USER EDITABLE PART: Changes made here may be lost with the next upgrade @@ -47,6 +47,7 @@ export WM_PROJECT_VERSION=dash if [ -n "$bashrcFile" ] then export FOAM_INST_DIR=$(cd $(dirname $bashrcFile)/../.. && pwd -P) + export FOAM_PROJECT_DIR=$(cd $(dirname $bashrcFile)/.. && pwd -P) else export FOAM_INST_DIR=$(cd $(dirname $0)/.. && pwd -P) export FOAM_PROJECT_DIR=$(cd $(dirname $0) && pwd -P) @@ -84,7 +85,7 @@ export WM_ARCH_OPTION=64 #- Precision: # WM_PRECISION_OPTION = SP | DP | LP -export WM_PRECISION_OPTION=DP +export WM_PRECISION_OPTION=SP #- Label size: # WM_LABEL_SIZE = 32 | 64 @@ -97,7 +98,7 @@ export WM_COMPILE_OPTION=Opt #- MPI implementation: # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI # | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI -export WM_MPLIB=SYSTEMOPENMPI +export WM_MPLIB=NONE #SYSTEMOPENMPI #- Operating System: # WM_OSTYPE = POSIX | ??? @@ -111,7 +112,7 @@ export PARMETIS_TYPE=none export ZOLTAN_TYPE=none #ThirdParty # ParaView_TYPE = none | system | paraviewopenfoam | ThirdParty (OpenFOAM) -export ParaView_TYPE=system +export ParaView_TYPE=none #- Floating-point signal handling: # set or unset @@ -176,9 +177,9 @@ _foamParams $@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if [ ${WM_THIRD_PARTY%%/*} = ${WM_PROJECT_DIR##*/} ] then - export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/$WM_THIRD_PARTY + export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/$WM_THIRD_PARTY else - export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/$WM_THIRD_PARTY-$WM_PROJECT_VERSION + export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/$WM_THIRD_PARTY-$WM_PROJECT_VERSION fi if [ -d "$WM_THIRD_PARTY_DIR" ] diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index b53d43aac9..f72268c758 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -489,7 +489,7 @@ void Foam::functionObjects::scalarTransport::solveMULES() volScalarField::New ( "cnBDCoeff", - max(cnCoeff, 1.0 - 1.0/max(Co, 2.0)), + max(cnCoeff, scalar(1.0) - scalar(1.0)/max(Co, scalar(2.0))), zeroGradientFvPatchField::typeName ) ) From d786b9e3f2e12e1187234ec2cea038bc4823d238 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 15 Jul 2025 11:52:20 +0200 Subject: [PATCH 18/20] Reenable SP --- .daisy/workflow-openfoam.yml | 16 ++++++++-------- etc/custom_bashrc | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index 38b6367d29..ff63132830 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -30,18 +30,18 @@ steps: profiler: perf env: FOAM_APP: "/workspace/applications" - FOAM_APPBIN: "/workspace/platforms/linux64GccDPInt32Opt/bin" - FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + FOAM_APPBIN: "/workspace/platforms/linux64GccSPInt32Opt/bin" + FOAM_EXT_LIBBIN: "/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" FOAM_INST_DIR: "/" - FOAM_LIBBIN: "/workspace/platforms/linux64GccDPInt32Opt/lib" + 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/linux64GccDPInt32Opt/bin" - FOAM_USER_LIBBIN: "/platforms/linux64GccDPInt32Opt/lib" + FOAM_USER_APPBIN: "/platforms/linux64GccSPInt32Opt/bin" + FOAM_USER_LIBBIN: "/platforms/linux64GccSPInt32Opt/lib" FOAM_UTILITIES: "/workspace/applications/utilities" WM_ARCH: "linux64" WM_ARCH_OPTION: "64" @@ -58,9 +58,9 @@ steps: WM_LDFLAGS: "-m64" WM_LINK_LANGUAGE: "c++" WM_MPLIB: NONE #"SYSTEMOPENMPI" - WM_OPTIONS: "linux64GccDPInt32Opt" + WM_OPTIONS: "linux64GccSPInt32Opt" WM_OSTYPE: "POSIX" - WM_PRECISION_OPTION: "DP" + WM_PRECISION_OPTION: "SP" WM_PROJECT: "OpenFOAM" WM_PROJECT_DIR: "/workspace" WM_PROJECT_INST_DIR: "/" @@ -70,5 +70,5 @@ steps: 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy + 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 diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 076911ff33..8cc07854ba 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -1,16 +1,16 @@ export FOAM_APP="/workspace/applications" - export FOAM_APPBIN="/workspace/platforms/linux64GccDPInt32Opt/bin" - export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccDPInt32/lib" + export FOAM_APPBIN="/workspace/platforms/linux64GccSPInt32Opt/bin" + export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" export FOAM_INST_DIR="/" - export FOAM_LIBBIN="/workspace/platforms/linux64GccDPInt32Opt/lib" + export FOAM_LIBBIN="/workspace/platforms/linux64GccSPInt32Opt/lib" export FOAM_MODULES="/workspace/applications/modules" export FOAM_MPI="openmpi-system" export FOAM_PROJECT_DIR="/workspace" export FOAM_SOLVERS="/workspace/applications/solvers" export FOAM_SRC="/workspace/src" export FOAM_TUTORIALS="/workspace/tutorials" - export FOAM_USER_APPBIN="/platforms/linux64GccDPInt32Opt/bin" - export FOAM_USER_LIBBIN="/platforms/linux64GccDPInt32Opt/lib" + export FOAM_USER_APPBIN="/platforms/linux64GccSPInt32Opt/bin" + export FOAM_USER_LIBBIN="/platforms/linux64GccSPInt32Opt/lib" export FOAM_UTILITIES="/workspace/applications/utilities" export WM_ARCH="linux64" @@ -28,9 +28,9 @@ export WM_LDFLAGS="-m64" export WM_LINK_LANGUAGE="c++" export WM_MPLIB=NONE #"SYSTEMOPENMPI" - export WM_OPTIONS="linux64GccDPInt32Opt" + export WM_OPTIONS="linux64GccSPInt32Opt" export WM_OSTYPE="POSIX" - export WM_PRECISION_OPTION="DP" + export WM_PRECISION_OPTION="SP" export WM_PROJECT="OpenFOAM" export WM_PROJECT_DIR="/workspace" export WM_PROJECT_INST_DIR="/" @@ -43,5 +43,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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/linux64GccDPInt32Opt/lib:/workspace/platforms/linux64GccDPInt32Opt/lib/dummy + 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 export LIBRARY_PATH=/usr/local/lib From 7aac6f0ac8dbbef15a22114a5c59ff0c37ac7ee8 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Tue, 15 Jul 2025 23:44:15 +0200 Subject: [PATCH 19/20] Compiler things --- etc/bashrc | 5 +++-- etc/config.sh/compiler | 10 ++++++++-- wmake/rules/linux64Clang/c | 2 +- wmake/rules/linux64Clang/c++ | 2 +- wmake/rules/linux64DOCC/c | 16 ++++++++++++++++ wmake/rules/linux64DOCC/c++ | 28 ++++++++++++++++++++++++++++ wmake/rules/linux64DOCC/c++Debug | 2 ++ wmake/rules/linux64DOCC/c++Opt | 2 ++ wmake/rules/linux64DOCC/c++Prof | 2 ++ wmake/rules/linux64DOCC/cDebug | 2 ++ wmake/rules/linux64DOCC/cOpt | 2 ++ wmake/rules/linux64DOCC/cProf | 2 ++ wmake/rules/linux64DOCC/general | 8 ++++++++ wmake/rules/linuxClang/c | 2 +- wmake/rules/linuxClang/c++ | 2 +- wmake/rules/linuxDOCC/c | 16 ++++++++++++++++ wmake/rules/linuxDOCC/c++ | 28 ++++++++++++++++++++++++++++ wmake/rules/linuxDOCC/c++Debug | 2 ++ wmake/rules/linuxDOCC/c++Opt | 2 ++ wmake/rules/linuxDOCC/c++Prof | 2 ++ wmake/rules/linuxDOCC/cDebug | 2 ++ wmake/rules/linuxDOCC/cOpt | 2 ++ wmake/rules/linuxDOCC/cProf | 2 ++ wmake/rules/linuxDOCC/general | 8 ++++++++ 24 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 wmake/rules/linux64DOCC/c create mode 100644 wmake/rules/linux64DOCC/c++ create mode 100644 wmake/rules/linux64DOCC/c++Debug create mode 100644 wmake/rules/linux64DOCC/c++Opt create mode 100644 wmake/rules/linux64DOCC/c++Prof create mode 100644 wmake/rules/linux64DOCC/cDebug create mode 100644 wmake/rules/linux64DOCC/cOpt create mode 100644 wmake/rules/linux64DOCC/cProf create mode 100644 wmake/rules/linux64DOCC/general create mode 100644 wmake/rules/linuxDOCC/c create mode 100644 wmake/rules/linuxDOCC/c++ create mode 100644 wmake/rules/linuxDOCC/c++Debug create mode 100644 wmake/rules/linuxDOCC/c++Opt create mode 100644 wmake/rules/linuxDOCC/c++Prof create mode 100644 wmake/rules/linuxDOCC/cDebug create mode 100644 wmake/rules/linuxDOCC/cOpt create mode 100644 wmake/rules/linuxDOCC/cProf create mode 100644 wmake/rules/linuxDOCC/general diff --git a/etc/bashrc b/etc/bashrc index 4e1d52555d..0ad04ed4ef 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -74,9 +74,10 @@ export WM_COMPILER_TYPE=system #- Compiler: # WM_COMPILER = Gcc | Gcc48 ... Gcc62 | Clang | Icx -export WM_COMPILER=Gcc +export WM_COMPILER=DOCC # Clang #Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH +echo $WM_COMPILER #- Memory addressing: # On a 64bit OS this can be 32bit or 64bit # On a 32bit OS addressing is 32bit and this option is not used @@ -89,7 +90,7 @@ export WM_PRECISION_OPTION=SP #- Label size: # WM_LABEL_SIZE = 32 | 64 -export WM_LABEL_SIZE=32 +export WM_LABEL_SIZE=64 #- Optimised, debug, profiling: # WM_COMPILE_OPTION = Opt | Debug | Prof diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler index fd25d200e2..79bc8ed0da 100644 --- a/etc/config.sh/compiler +++ b/etc/config.sh/compiler @@ -37,6 +37,8 @@ OpenFOAM | ThirdParty) gmp_version=gmp-5.1.2 mpfr_version=mpfr-3.1.2 mpc_version=mpc-1.0.1 + + echo $WM_COMPILER case "$WM_COMPILER" in Gcc55) @@ -62,10 +64,14 @@ OpenFOAM | ThirdParty) ;; Clang) # Using clang - not gcc - export WM_CC='clang' - export WM_CXX='clang++' + export WM_CC='clang-15' + export WM_CXX='clang++-15' clang_version=llvm-3.7.0 ;; + DOCC) + export WM_CC='docc' + export WM_CXX='docc-cpp' + ;; *) /bin/cat <&2 diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c index b743e3f68c..fc9f5c4b37 100644 --- a/wmake/rules/linux64Clang/c +++ b/wmake/rules/linux64Clang/c @@ -2,7 +2,7 @@ SUFFIXES += .c cWARN = -Wall -cc = clang -m64 +cc = clang-15 -m64 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++ index fe76c92623..517ce127b5 100644 --- a/wmake/rules/linux64Clang/c++ +++ b/wmake/rules/linux64Clang/c++ @@ -8,7 +8,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \ -Wno-tautological-undefined-compare -Wno-shift-negative-value -CC = clang++ -std=c++14 -m64 +CC = clang++-15 -std=c++14 -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linux64DOCC/c b/wmake/rules/linux64DOCC/c new file mode 100644 index 0000000000..999ae91c7d --- /dev/null +++ b/wmake/rules/linux64DOCC/c @@ -0,0 +1,16 @@ +SUFFIXES += .c + +cWARN = -Wall + +cc = docc -m64 + +include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64DOCC/c++ b/wmake/rules/linux64DOCC/c++ new file mode 100644 index 0000000000..bf6ea619a9 --- /dev/null +++ b/wmake/rules/linux64DOCC/c++ @@ -0,0 +1,28 @@ +SUFFIXES += .C + +c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \ + -Wno-unused-parameter -Wno-invalid-offsetof \ + -Wno-undefined-var-template -Wno-unqualified-std-cast-call + +# Suppress some warnings for flex++ +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \ + -Wno-tautological-undefined-compare -Wno-shift-negative-value + +CC = docc-cpp -std=c++14 -m64 + +include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \ + $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linux64DOCC/c++Debug b/wmake/rules/linux64DOCC/c++Debug new file mode 100644 index 0000000000..1c63335a3f --- /dev/null +++ b/wmake/rules/linux64DOCC/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -g -DFULLDEBUG +c++OPT = -O0 diff --git a/wmake/rules/linux64DOCC/c++Opt b/wmake/rules/linux64DOCC/c++Opt new file mode 100644 index 0000000000..2aedabd628 --- /dev/null +++ b/wmake/rules/linux64DOCC/c++Opt @@ -0,0 +1,2 @@ +c++DBUG = +c++OPT = -O3 diff --git a/wmake/rules/linux64DOCC/c++Prof b/wmake/rules/linux64DOCC/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linux64DOCC/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linux64DOCC/cDebug b/wmake/rules/linux64DOCC/cDebug new file mode 100644 index 0000000000..7b7adf10de --- /dev/null +++ b/wmake/rules/linux64DOCC/cDebug @@ -0,0 +1,2 @@ +cDBUG = -g -DFULLDEBUG +cOPT = -O0 diff --git a/wmake/rules/linux64DOCC/cOpt b/wmake/rules/linux64DOCC/cOpt new file mode 100644 index 0000000000..17318709f1 --- /dev/null +++ b/wmake/rules/linux64DOCC/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 diff --git a/wmake/rules/linux64DOCC/cProf b/wmake/rules/linux64DOCC/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linux64DOCC/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linux64DOCC/general b/wmake/rules/linux64DOCC/general new file mode 100644 index 0000000000..65aabcd70a --- /dev/null +++ b/wmake/rules/linux64DOCC/general @@ -0,0 +1,8 @@ +LD = docc-cpp # -melf_i386 + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(DEFAULT_RULES)/c +include $(DEFAULT_RULES)/c++ diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c index 2c8e8a7f9c..5e0a40ea14 100644 --- a/wmake/rules/linuxClang/c +++ b/wmake/rules/linuxClang/c @@ -2,7 +2,7 @@ SUFFIXES += .c cWARN = -Wall -cc = clang -m32 +cc = clang-15 -m32 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++ index f76912152b..abbabc2c81 100644 --- a/wmake/rules/linuxClang/c++ +++ b/wmake/rules/linuxClang/c++ @@ -8,7 +8,7 @@ c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \ c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \ -Wno-tautological-undefined-compare -Wno-shift-negative-value -CC = clang++ -std=c++14 -m32 +CC = clang++-15 -std=c++14 -m32 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) diff --git a/wmake/rules/linuxDOCC/c b/wmake/rules/linuxDOCC/c new file mode 100644 index 0000000000..69b2ddc8a1 --- /dev/null +++ b/wmake/rules/linuxDOCC/c @@ -0,0 +1,16 @@ +SUFFIXES += .c + +cWARN = -Wall + +cc = docc -mllvm -hotspot -m32 + +include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs -ldaisy_rtl diff --git a/wmake/rules/linuxDOCC/c++ b/wmake/rules/linuxDOCC/c++ new file mode 100644 index 0000000000..88baac70c3 --- /dev/null +++ b/wmake/rules/linuxDOCC/c++ @@ -0,0 +1,28 @@ +SUFFIXES += .C + +c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \ + -Wno-unused-parameter -Wno-invalid-offsetof \ + -Wno-undefined-var-template -Wno-unqualified-std-cast-call + +# Suppress some warnings for flex++ +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \ + -Wno-tautological-undefined-compare -Wno-shift-negative-value + +CC = docc-cpp -std=c++14 -m32 + +include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \ + $(LIB_HEADER_DIRS) -fPIC -mllvm -hotspot + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -ldaisy_rtl diff --git a/wmake/rules/linuxDOCC/c++Debug b/wmake/rules/linuxDOCC/c++Debug new file mode 100644 index 0000000000..1c63335a3f --- /dev/null +++ b/wmake/rules/linuxDOCC/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -g -DFULLDEBUG +c++OPT = -O0 diff --git a/wmake/rules/linuxDOCC/c++Opt b/wmake/rules/linuxDOCC/c++Opt new file mode 100644 index 0000000000..2aedabd628 --- /dev/null +++ b/wmake/rules/linuxDOCC/c++Opt @@ -0,0 +1,2 @@ +c++DBUG = +c++OPT = -O3 diff --git a/wmake/rules/linuxDOCC/c++Prof b/wmake/rules/linuxDOCC/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linuxDOCC/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linuxDOCC/cDebug b/wmake/rules/linuxDOCC/cDebug new file mode 100644 index 0000000000..7b7adf10de --- /dev/null +++ b/wmake/rules/linuxDOCC/cDebug @@ -0,0 +1,2 @@ +cDBUG = -g -DFULLDEBUG +cOPT = -O0 diff --git a/wmake/rules/linuxDOCC/cOpt b/wmake/rules/linuxDOCC/cOpt new file mode 100644 index 0000000000..17318709f1 --- /dev/null +++ b/wmake/rules/linuxDOCC/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 diff --git a/wmake/rules/linuxDOCC/cProf b/wmake/rules/linuxDOCC/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linuxDOCC/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linuxDOCC/general b/wmake/rules/linuxDOCC/general new file mode 100644 index 0000000000..b625cfb688 --- /dev/null +++ b/wmake/rules/linuxDOCC/general @@ -0,0 +1,8 @@ +LD = ld -melf_i386 + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(DEFAULT_RULES)/c +include $(DEFAULT_RULES)/c++ From c53d36d5515d32dffe092530de9c2571dadfe48a Mon Sep 17 00:00:00 2001 From: Ramon Wirsch Date: Mon, 15 Sep 2025 13:08:40 +0200 Subject: [PATCH 20/20] Extracted WM_PROJECT_DIR env var from setup script to have that customizable. Workflow sets it to the previous value. --- .daisy/workflow-openfoam.yml | 1 + etc/custom_bashrc | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.daisy/workflow-openfoam.yml b/.daisy/workflow-openfoam.yml index ff63132830..78583be5d4 100644 --- a/.daisy/workflow-openfoam.yml +++ b/.daisy/workflow-openfoam.yml @@ -14,6 +14,7 @@ steps: 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 diff --git a/etc/custom_bashrc b/etc/custom_bashrc index 8cc07854ba..370cdd9e8e 100644 --- a/etc/custom_bashrc +++ b/etc/custom_bashrc @@ -1,17 +1,19 @@ - export FOAM_APP="/workspace/applications" - export FOAM_APPBIN="/workspace/platforms/linux64GccSPInt32Opt/bin" - export FOAM_EXT_LIBBIN="/workspace/ThirdParty-dev/platforms/linux64GccSPInt32/lib" + + + export FOAM_APP="$WM_PROJECT_DIR/applications" + export FOAM_APPBIN="$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/bin" + export FOAM_EXT_LIBBIN="$WM_PROJECT_DIR/ThirdParty-dev/platforms/linux64GccSPInt32/lib" export FOAM_INST_DIR="/" - export FOAM_LIBBIN="/workspace/platforms/linux64GccSPInt32Opt/lib" - export FOAM_MODULES="/workspace/applications/modules" + export FOAM_LIBBIN="$WM_PROJECT_DIR/platforms/linux64GccSPInt32Opt/lib" + export FOAM_MODULES="$WM_PROJECT_DIR/applications/modules" export FOAM_MPI="openmpi-system" - export FOAM_PROJECT_DIR="/workspace" - export FOAM_SOLVERS="/workspace/applications/solvers" - export FOAM_SRC="/workspace/src" - export FOAM_TUTORIALS="/workspace/tutorials" + export FOAM_PROJECT_DIR="$WM_PROJECT_DIR" + export FOAM_SOLVERS="$WM_PROJECT_DIR/applications/solvers" + export FOAM_SRC="$WM_PROJECT_DIR/src" + export FOAM_TUTORIALS="$WM_PROJECT_DIR/tutorials" export FOAM_USER_APPBIN="/platforms/linux64GccSPInt32Opt/bin" export FOAM_USER_LIBBIN="/platforms/linux64GccSPInt32Opt/lib" - export FOAM_UTILITIES="/workspace/applications/utilities" + export FOAM_UTILITIES="$WM_PROJECT_DIR/applications/utilities" export WM_ARCH="linux64" export WM_ARCH_OPTION="64" @@ -22,7 +24,7 @@ export WM_COMPILE_OPTION="Opt" export WM_CXX="g++" export WM_CXXFLAGS="-m64 -fPIC -std=c++0x -g" - export WM_DIR="/workspace/wmake" + export WM_DIR="$WM_PROJECT_DIR/wmake" export WM_LABEL_OPTION="Int32" export WM_LABEL_SIZE="32" export WM_LDFLAGS="-m64" @@ -32,9 +34,8 @@ export WM_OSTYPE="POSIX" export WM_PRECISION_OPTION="SP" export WM_PROJECT="OpenFOAM" - export WM_PROJECT_DIR="/workspace" export WM_PROJECT_INST_DIR="/" - export WM_THIRD_PARTY_DIR="/workspace/ThirdParty-dev" + export WM_THIRD_PARTY_DIR="$WM_PROJECT_DIR/ThirdParty-dev" export SCOTCH_TYPE=none #ThirdParty export METIS_TYPE=none @@ -43,5 +44,5 @@ export PATH=$PATH:$WM_PROJECT_DIR/wmake - 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 + 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 export LIBRARY_PATH=/usr/local/lib