From 4733337c26ad8ed02b0abd962555ab23fe07b03c Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Mon, 14 Jul 2025 14:43:18 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 394f8995fc4ffed34fa8493249629513428889fd Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 1 Oct 2025 18:08:25 +0200 Subject: [PATCH 08/10] Rm temp tutorial files --- tutorials/incompressibleFluid/cavity/0/U | 39 ----------- .../incompressibleFluid/cavity/0/epsilon | 40 ----------- tutorials/incompressibleFluid/cavity/0/k | 40 ----------- .../incompressibleFluid/cavity/0/nuTilda | 38 ----------- tutorials/incompressibleFluid/cavity/0/nut | 40 ----------- tutorials/incompressibleFluid/cavity/0/omega | 40 ----------- tutorials/incompressibleFluid/cavity/0/p | 38 ----------- .../motorBike/motorBike/0/U | 66 ------------------- .../motorBike/motorBike/0/k | 59 ----------------- .../motorBike/motorBike/0/nuTilda | 59 ----------------- .../motorBike/motorBike/0/nut | 60 ----------------- .../motorBike/motorBike/0/p | 55 ---------------- 12 files changed, 574 deletions(-) delete mode 100644 tutorials/incompressibleFluid/cavity/0/U delete mode 100644 tutorials/incompressibleFluid/cavity/0/epsilon delete mode 100644 tutorials/incompressibleFluid/cavity/0/k delete mode 100644 tutorials/incompressibleFluid/cavity/0/nuTilda delete mode 100644 tutorials/incompressibleFluid/cavity/0/nut delete mode 100644 tutorials/incompressibleFluid/cavity/0/omega delete mode 100644 tutorials/incompressibleFluid/cavity/0/p delete mode 100644 tutorials/incompressibleFluid/motorBike/motorBike/0/U delete mode 100644 tutorials/incompressibleFluid/motorBike/motorBike/0/k delete mode 100644 tutorials/incompressibleFluid/motorBike/motorBike/0/nuTilda delete mode 100644 tutorials/incompressibleFluid/motorBike/motorBike/0/nut delete mode 100644 tutorials/incompressibleFluid/motorBike/motorBike/0/p diff --git a/tutorials/incompressibleFluid/cavity/0/U b/tutorials/incompressibleFluid/cavity/0/U deleted file mode 100644 index 4c0fa73307..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/U +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - movingWall - { - type fixedValue; - value uniform (1 0 0); - } - - fixedWalls - { - type noSlip; - } - - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/epsilon b/tutorials/incompressibleFluid/cavity/0/epsilon deleted file mode 100644 index 33cd6ef122..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/epsilon +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 0.00754; - -boundaryField -{ - movingWall - { - type epsilonWallFunction; - value uniform 0.00754; - } - fixedWalls - { - type epsilonWallFunction; - value uniform 0.00754; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/k b/tutorials/incompressibleFluid/cavity/0/k deleted file mode 100644 index 01e099a52e..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/k +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.00375; - -boundaryField -{ - movingWall - { - type kqRWallFunction; - value uniform 0.00375; - } - fixedWalls - { - type kqRWallFunction; - value uniform 0.00375; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/nuTilda b/tutorials/incompressibleFluid/cavity/0/nuTilda deleted file mode 100644 index f4fbd7ff04..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/nuTilda +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object nuTilda; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - movingWall - { - type zeroGradient; - } - - fixedWalls - { - type zeroGradient; - } - - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/nut b/tutorials/incompressibleFluid/cavity/0/nut deleted file mode 100644 index 36b41efd72..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/nut +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - movingWall - { - type nutkWallFunction; - value uniform 0; - } - fixedWalls - { - type nutkWallFunction; - value uniform 0; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/omega b/tutorials/incompressibleFluid/cavity/0/omega deleted file mode 100644 index 70d7f106a4..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/omega +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object omega; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 -1 0 0 0 0]; - -internalField uniform 22.4; - -boundaryField -{ - movingWall - { - type omegaWallFunction; - value uniform 22.4; - } - fixedWalls - { - type omegaWallFunction; - value uniform 22.4; - } - frontAndBack - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/cavity/0/p b/tutorials/incompressibleFluid/cavity/0/p deleted file mode 100644 index 23072cc617..0000000000 --- a/tutorials/incompressibleFluid/cavity/0/p +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - movingWall - { - type zeroGradient; - } - - fixedWalls - { - type zeroGradient; - } - - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/0/U b/tutorials/incompressibleFluid/motorBike/motorBike/0/U deleted file mode 100644 index b9f06e546a..0000000000 --- a/tutorials/incompressibleFluid/motorBike/motorBike/0/U +++ /dev/null @@ -1,66 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -flowVelocity (20 0 0); - -pressure 0; - -turbulentKE 0.24; - -turbulentOmega 1.78; - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (20 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (20 0 0); - } - outlet - { - type inletOutlet; - inletValue uniform (0 0 0); - value uniform (20 0 0); - } - lowerWall - { - type fixedValue; - value uniform (20 0 0); - } - "motorBike_.*" - { - type noSlip; - } - upperWall - { - type symmetryPlane; - } - "(front|back)" - { - type symmetryPlane; - } - "proc.*" - { - type processor; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/0/k b/tutorials/incompressibleFluid/motorBike/motorBike/0/k deleted file mode 100644 index 220343c31d..0000000000 --- a/tutorials/incompressibleFluid/motorBike/motorBike/0/k +++ /dev/null @@ -1,59 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.24; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.24; - } - outlet - { - type inletOutlet; - inletValue uniform 0.24; - value uniform 0.24; - } - lowerWall - { - type kqRWallFunction; - value uniform 0.24; - } - "motorBike_.*" - { - type kqRWallFunction; - value uniform 0.24; - } - upperWall - { - type symmetryPlane; - } - "(front|back)" - { - type symmetryPlane; - } - "proc.*" - { - type processor; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/0/nuTilda b/tutorials/incompressibleFluid/motorBike/motorBike/0/nuTilda deleted file mode 100644 index 44633f675b..0000000000 --- a/tutorials/incompressibleFluid/motorBike/motorBike/0/nuTilda +++ /dev/null @@ -1,59 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object nuTilda; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0.05; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.05; - } - outlet - { - type inletOutlet; - inletValue uniform 0.05; - value uniform 0.05; - } - lowerWall - { - type fixedValue; - value uniform 0; - } - "motorBike_.*" - { - type fixedValue; - value uniform 0; - } - upperWall - { - type symmetryPlane; - } - "(front|back)" - { - type symmetryPlane; - } - "proc.*" - { - type processor; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/0/nut b/tutorials/incompressibleFluid/motorBike/motorBike/0/nut deleted file mode 100644 index 9ea5be390c..0000000000 --- a/tutorials/incompressibleFluid/motorBike/motorBike/0/nut +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - "(front|back)" - { - type symmetryPlane; - value uniform 0; - } - inlet - { - type calculated; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - lowerWall - { - type nutUSpaldingWallFunction; - value uniform 0; - } - upperWall - { - type symmetryPlane; - value uniform 0; - } - "motorBike_.*" - { - type nutUSpaldingWallFunction; - value uniform 0; - } - "proc.*" - { - type processor; - } -} - - -// ************************************************************************* // diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/0/p b/tutorials/incompressibleFluid/motorBike/motorBike/0/p deleted file mode 100644 index 0d6fb9b41a..0000000000 --- a/tutorials/incompressibleFluid/motorBike/motorBike/0/p +++ /dev/null @@ -1,55 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type zeroGradient; - } - outlet - { - type fixedValue; - value uniform 0; - } - lowerWall - { - type zeroGradient; - } - "motorBike_.*" - { - type zeroGradient; - } - upperWall - { - type symmetryPlane; - } - "(front|back)" - { - type symmetryPlane; - } - "proc.*" - { - type processor; - } -} - - -// ************************************************************************* // From a38a7452c864fa746e2bb0b3429bac4a2a468382 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 1 Oct 2025 18:09:33 +0200 Subject: [PATCH 09/10] Change bashrc to fit custom bashrc --- etc/bashrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 0ad04ed4ef..8007505fa2 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -74,7 +74,7 @@ export WM_COMPILER_TYPE=system #- Compiler: # WM_COMPILER = Gcc | Gcc48 ... Gcc62 | Clang | Icx -export WM_COMPILER=DOCC # Clang #Gcc +export WM_COMPILER=Gcc # Clang #Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH echo $WM_COMPILER @@ -90,7 +90,7 @@ export WM_PRECISION_OPTION=SP #- Label size: # WM_LABEL_SIZE = 32 | 64 -export WM_LABEL_SIZE=64 +export WM_LABEL_SIZE=32 #- Optimised, debug, profiling: # WM_COMPILE_OPTION = Opt | Debug | Prof From faa02a21ddba0104520567aae48162f627d8ed98 Mon Sep 17 00:00:00 2001 From: Nora Hagmeyer Date: Wed, 1 Oct 2025 18:15:50 +0200 Subject: [PATCH 10/10] Run motorbike sequentially and make it readable --- tutorials/incompressibleFluid/motorBike/lesFiles/Allrun | 2 +- tutorials/incompressibleFluid/motorBike/motorBike/Allrun | 8 ++++---- .../motorBike/motorBike/system/controlDict | 2 +- tutorials/incompressibleFluid/motorBikeSteady/Allrun | 8 ++++---- .../motorBikeSteady/system/controlDict | 3 ++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun b/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun index db513d262e..83bb247f78 100755 --- a/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun +++ b/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun @@ -12,7 +12,7 @@ ls -d processor* | xargs -I {} rm -rf ./{}/0 ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform -runParallel foamRun +runApplication foamRun runApplication reconstructPar diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/Allrun b/tutorials/incompressibleFluid/motorBike/motorBike/Allrun index 331c522071..12088ac35d 100755 --- a/tutorials/incompressibleFluid/motorBike/motorBike/Allrun +++ b/tutorials/incompressibleFluid/motorBike/motorBike/Allrun @@ -9,14 +9,14 @@ cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/geometry/ runApplication blockMesh runApplication decomposePar -copyZero -runParallel snappyHexMesh -overwrite +runApplication snappyHexMesh -overwrite find . -type f -iname "*level*" -exec rm {} \; -runParallel renumberMesh -overwrite +runApplication renumberMesh -overwrite -runParallel potentialFoam -initialiseUBCs +runApplication potentialFoam -initialiseUBCs -runParallel foamRun +runApplication foamRun #------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/motorBike/motorBike/system/controlDict b/tutorials/incompressibleFluid/motorBike/motorBike/system/controlDict index 35c73381c2..efa4565fad 100644 --- a/tutorials/incompressibleFluid/motorBike/motorBike/system/controlDict +++ b/tutorials/incompressibleFluid/motorBike/motorBike/system/controlDict @@ -32,7 +32,7 @@ writeInterval 500; purgeWrite 0; -writeFormat binary; +writeFormat ascii; writePrecision 6; diff --git a/tutorials/incompressibleFluid/motorBikeSteady/Allrun b/tutorials/incompressibleFluid/motorBikeSteady/Allrun index aed41fc5c5..9e98f7ed75 100755 --- a/tutorials/incompressibleFluid/motorBikeSteady/Allrun +++ b/tutorials/incompressibleFluid/motorBikeSteady/Allrun @@ -11,11 +11,11 @@ runApplication surfaceFeatures runApplication blockMesh runApplication decomposePar -copyZero -runParallel snappyHexMesh -overwrite +runApplication snappyHexMesh -overwrite -runParallel patchSummary -runParallel potentialFoam -runParallel foamRun +runApplication patchSummary +runApplication potentialFoam +runApplication foamRun runApplication reconstructPar -latestTime diff --git a/tutorials/incompressibleFluid/motorBikeSteady/system/controlDict b/tutorials/incompressibleFluid/motorBikeSteady/system/controlDict index 96e9be3a22..aae38eeb90 100644 --- a/tutorials/incompressibleFluid/motorBikeSteady/system/controlDict +++ b/tutorials/incompressibleFluid/motorBikeSteady/system/controlDict @@ -9,6 +9,7 @@ FoamFile { format ascii; class dictionary; + location "system"; object controlDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,7 +32,7 @@ writeInterval 100; purgeWrite 0; -writeFormat binary; +writeFormat ascii; writePrecision 6;