Skip to content

Build without mpi #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NoraHagmeyer wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Build without mpi #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4733337
Build openfoam without mpi
NoraHagmeyer Jul 14, 2025
bbe429f
Switch to SP
NoraHagmeyer Jul 14, 2025
2eea0ca
Revert "Switch to SP"
NoraHagmeyer Jul 15, 2025
e5c52fb
Donnot use mpi durign build
NoraHagmeyer Jul 15, 2025
b6a6da1
Local changes
NoraHagmeyer Jul 15, 2025
d786b9e
Reenable SP
NoraHagmeyer Jul 15, 2025
7aac6f0
Compiler things
NoraHagmeyer Jul 15, 2025
394f899
Rm temp tutorial files
NoraHagmeyer Oct 1, 2025
a38a745
Change bashrc to fit custom bashrc
NoraHagmeyer Oct 1, 2025
faa02a2
Run motorbike sequentially and make it readable
NoraHagmeyer Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 11 additions & 62 deletions .daisy/workflow-openfoam.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,29 +23,25 @@ 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"
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"
Expand All @@ -61,10 +57,10 @@ steps:
WM_LABEL_SIZE: "32"
WM_LDFLAGS: "-m64"
WM_LINK_LANGUAGE: "c++"
WM_MPLIB: "SYSTEMOPENMPI"
WM_OPTIONS: "linux64GccDPInt32Opt"
WM_MPLIB: NONE #"SYSTEMOPENMPI"
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: "/"
Expand All @@ -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/linux64GccSPInt32Opt/lib:/workspace/platforms/linux64GccSPInt32Opt/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
4 changes: 2 additions & 2 deletions applications/modules/compressibleVoF/alphaSuSp.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
16 changes: 9 additions & 7 deletions etc/bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -73,9 +74,10 @@ export WM_COMPILER_TYPE=system

#- Compiler:
# WM_COMPILER = Gcc | Gcc48 ... Gcc62 | Clang | Icx
export WM_COMPILER=Gcc
export WM_COMPILER=Gcc # 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
Expand All @@ -84,7 +86,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
Expand All @@ -97,7 +99,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 | ???
Expand All @@ -111,7 +113,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
Expand Down Expand Up @@ -176,9 +178,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" ]
Expand Down
10 changes: 8 additions & 2 deletions etc/config.sh/compiler
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 <<USAGE 1>&2

Expand Down
18 changes: 9 additions & 9 deletions etc/custom_bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -27,10 +27,10 @@
export WM_LABEL_SIZE="32"
export WM_LDFLAGS="-m64"
export WM_LINK_LANGUAGE="c++"
export WM_MPLIB="SYSTEMOPENMPI"
export WM_OPTIONS="linux64GccDPInt32Opt"
export WM_MPLIB=NONE #"SYSTEMOPENMPI"
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="/"
Expand All @@ -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/linux64GccSPInt32Opt/lib:/workspace/platforms/linux64GccSPInt32Opt/lib/dummy
export LIBRARY_PATH=/usr/local/lib
2 changes: 1 addition & 1 deletion src/functionObjects/solvers/scalarTransport/scalarTransport.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<scalar>::typeName
)
)
Expand Down
39 changes: 0 additions & 39 deletions tutorials/incompressibleFluid/cavity/0/U
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions tutorials/incompressibleFluid/cavity/0/epsilon
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions tutorials/incompressibleFluid/cavity/0/k
View file
Open in desktop

This file was deleted.

Loading