From 5c3a4af55adbd6b39213af5339fdae4b63f38fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?=
 <12963281+gao-wenyao123@user.noreply.gitee.com>
Date: Wed, 25 Jun 2025 09:35:46 +0800
Subject: [PATCH 1/2] fds

---
 .../fds/6.7.4/data.fds.arm.clang.cpu.config   | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/templates/fds/6.7.4/data.fds.arm.clang.cpu.config b/templates/fds/6.7.4/data.fds.arm.clang.cpu.config
index 25a14b2..9986a43 100644
--- a/templates/fds/6.7.4/data.fds.arm.clang.cpu.config
+++ b/templates/fds/6.7.4/data.fds.arm.clang.cpu.config
@@ -5,23 +5,36 @@
 FDS/6.7.4 https://github.com/firemodels/fds/archive/refs/tags/FDS6.7.4.tar.gz
 
 [DEPENDENCY]
-export CC=mpicc CXX=mpicxx FC=mpifort
+module purge
+./jarvis -install hpckit/2024.12.30 any
+module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
+export CC=`which mpicc`
+export CXX=`which mpicxx`
+export FC=`which mpifort`
+export F77=`which mpifort`
+tar -xvf  ${JARVIS_DOWNLOAD}/FDS6.7.4.tar.gz
 
 
 [ENV]
-export CC=mpicc CXX=mpicxx FC=mpifort
-export PATH=/hpcrunner/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
+module purge
+./jarvis -install hpckit/2024.12.30 any
+module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles
+module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi
+export CC=`which mpicc`
+export CXX=`which mpicxx`
+export FC=`which mpifort`
+export F77=`which mpifort`
+export PATH=${JARVIS_ROOT}/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
+export OMP_NUM_THREADS=1
 
 [APP]
 app_name = amg
-build_dir = ${JARVIS_ROOT}
-binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds/6.7.4/bin
+build_dir = ${JARVIS_ROOT}/fds-FDS6.7.4/Build
+binary_dir = ${JARVIS_ROOT}/fds-FDS6.7.4/
 case_dir =
 
 [BUILD]
-cd /hpcrunner/
-tar -xvf  ${JARVIS_DOWNLOAD}/FDS6.7.4.tar.gz
-cd fds-FDS6.7.4/Build
 sed -i "s/-ffpe-summary=none//g" ./makefile
 sed -i '58c\GNU_COMPINFO=-DCOMPVER_PP=\\"$(OPENMPI_COMPVERSION)\\"' ./makefile
 export CFLAGS="-Wno-implicit-function-declaration -Wno-implicit-int"
@@ -30,12 +43,13 @@ sed -i '29c\clang -v | head -1> gfortran_version 2>&1' Scripts/gnu_compversion.s
 sed -i '30c\GFORTRANVERSION=clang' Scripts/gnu_compversion.sh
 sed -i '32c\echo "\\"Gnu flang $GFORTRANVERSION\\""' Scripts/gnu_compversion.sh
 cd mpi_gnu_linux_64
-
-
-
 ./make_fds.sh
+export PATH=${JARVIS_ROOT}/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
+mkdir testcase
+export OMP_NUM_THREADS=1
+
 
 [RUN]
-run =
+run =`which mpirun` -np 8 --mca btl ^openib --allow-run-as-root ${JARVIS_ROOT}/fds-FDS6.7.4/Build/mpi_gnu_linux_64/fds_mpi_gnu_linux_64 ${JARVIS_ROOT}/fds-FDS6.7.4/Validation/MPI_Scaling_Tests/FDS_Input_Files/weak_scaling_test_128.fds
 binary =
 nodes = 1
-- 
Gitee


From 8167173baf9dd63df6b7c2be5e3bde00fccafe50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?=
 <12963281+gao-wenyao123@user.noreply.gitee.com>
Date: Wed, 25 Jun 2025 10:31:57 +0800
Subject: [PATCH 2/2] data.fds.arm.sve.cpu.config

---
 templates/fds/6.7.4/data.fds.arm.sve.cpu.config | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
index 20b0233..103b24e 100644
--- a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
+++ b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config
@@ -22,12 +22,14 @@ export CC=mpicc FC=mpifort CXX=mpicxx
 
 export CC=mpicc CXX=mpicxx FC=mpifort
 export PATH=${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
+export OMP_NUM_THREADS=1
+
 
 [APP]
 app_name = fds
 build_dir = ${JARVIS_ROOT}
 binary_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64
-case_dir = ${JARVIS_ROOT}/case
+case_dir = ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/testcase 
 
 [BUILD]
 mkdir -p ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4
@@ -45,9 +47,14 @@ cd mpi_gnu_linux_64
 
 
 ./make_fds.sh
+cd ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4
+mkdir testcase
+cd testcase
+export OMP_NUM_THREADS=1
+export PATH=${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64:$PATH
 
 [RUN]
-run =
+run = `which mpirun` -np 8 --mca btl ^openib --allow-run-as-root ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Build/mpi_gnu_linux_64/fds_mpi_gnu_linux_64 ${JARVIS_ROOT}/software/libs/bisheng4.0.0/hmpi2.4.1/fds-FDS6.7.4/Validation/MPI_Scaling_Tests/FDS_Input_Files/weak_scaling_test_128.fds
 binary =
 nodes = 1
 
-- 
Gitee