From e21966685b2673a9ab43937898195fd6ee8984d2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Nov 2025 14:16:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E4=BD=BF?= =?UTF-8?q?=E7=94=A8hpckit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1906/data.openfoam.new.bisheng.cpu.config | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config index a316793d..eea5a797 100644 --- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config +++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config @@ -8,26 +8,18 @@ ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdPart [DEPENDENCY] set -x set -e -module purge -module use ./software/modulefiles -./jarvis -install bisheng/3.2.0-mini com -module load bisheng/3.2.0-mini -export CC=clang CXX=clang++ FC=flang -./jarvis -install hmpi/2.3.0 clang -module load hmpi/2.3.0 -#release zip files -tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz +./jarvis -install hpckit/25.1.0 any + +source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng +mkdir -p ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ +tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ +tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ [ENV] -# add kgcc/mpi module purge -module use ./software/modulefiles -module load bisheng/3.2.0-mini -module use ./software/moduledeps -module load bisheng3.2.0/hmpi/2.3.0 -#source /hpcrunner/OpenFOAM-v1906/etc/bashrc +source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng +export CC=mpicc CXX=mpicxx FC=mpifort export PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH @@ -45,7 +37,7 @@ export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang [APP] app_name = OpenFOAM -build_dir = OpenFOAM-v1906/ +build_dir = ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/OpenFOAM-v1906/ binary_dir = case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/ -- Gitee From c8916c61c252997d8d94e4f0195eb6d3fe24e157 Mon Sep 17 00:00:00 2001 From: root <2277486684@qq.com> Date: Fri, 14 Nov 2025 12:35:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9hpckit=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=98=E9=87=8F=E6=8E=A7=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9env=E4=B8=AD=E8=BD=AF=E4=BB=B6=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1906/data.openfoam.new.bisheng.cpu.config | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config index eea5a797..eeb8de85 100644 --- a/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config +++ b/templates/openfoam/1906/data.openfoam.new.bisheng.cpu.config @@ -8,38 +8,38 @@ ThirdParty/v1906 https://sourceforge.net/projects/openfoam/files/v1906/ThirdPart [DEPENDENCY] set -x set -e -./jarvis -install hpckit/25.1.0 any +./jarvis -install hpckit/${HPCKIT_VERSION} any source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng mkdir -p ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ -tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ -tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz -C ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/ - +tar -xzvf $JARVIS_DOWNLOAD/OpenFOAM-v1906.tgz -C ${JARVIS_ROOT}/software/apps +tar -zxvf $JARVIS_DOWNLOAD/ThirdParty-v1906.tgz -C ${JARVIS_ROOT}/software/apps [ENV] module purge source ${JARVIS_ROOT}/software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/setvars.sh --force --use-bisheng export CC=mpicc CXX=mpicxx FC=mpifort -export PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH + +export PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/bin:$PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/dummy:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/OpenFOAM-v1906/platforms/linuxARM64ClangDPInt32Opt/lib/openmpi-system:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64Clang/fftw-3.3.7/lib64:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64Clang/boost_1_64_0/lib64:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH=${JARVIS_ROOT}/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${JARVIS_ROOT}/software/apps/ThirdParty-v1906/platforms/linuxARM64ClangDPInt32/lib/openmpi-system:$LD_LIBRARY_PATH [APP] app_name = OpenFOAM -build_dir = ${JARVIS_ROOT}/software/apps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/OpenFOAM-v1906/ +build_dir = software/apps/OpenFOAM-v1906/ binary_dir = -case_dir = OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/ +case_dir = software/apps/OpenFOAM-v1906/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/ [BUILD] sed -i "s|export WM_COMPILER=Gcc|export WM_COMPILER=Clang|g" ./etc/bashrc -- Gitee