From 3f1df27cbc674100a934199bcff93f4ff99e2a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E6=96=87=E5=B0=A7?= <18848977154@163.com>
Date: Tue, 9 Dec 2025 16:17:51 +0800
Subject: [PATCH] swan

---
 ...wan.singularity.arm.bisheng.SVE.cpu.config | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config b/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
index 343e529e..848f1b56 100644
--- a/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
+++ b/templates/swan/41.31/swan.singularity.arm.bisheng.SVE.cpu.config
@@ -7,20 +7,20 @@
 [DEPENDENCY]
 set -x
 set -e
-
 module purge
 ./jarvis -install hpckit/${HPCKIT_VERSION} any
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
-module add bisheng/compiler${BISHENG_VERSION}/bishengmodule bisheng/hmpi${HMPI_VERSION}/hmpi
-export CC=`which clang`
-export CXX=`which clang++`
-export FC=`which flang`
-export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
-./jarvis -install hdf5/1.12.0/clang clang+mpi
-module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}-hmpi24.12.30
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load bisheng/hmpi${HPCKIT_VERSION}/release
+export CC=`which mpicc`
+export CXX=`which mpicxx`
+export FC=`which mpifort`
+export F77=`which mpifort`
+./jarvis -install package/hdf5/1.12.0/clang bisheng+mpi
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION}
 module load hdf5-clang/1.12.0
-./jarvis -install pnetcdf/1.14.0 clang+mpi
-module load pnetcdf/1.14.0
+./jarvis -install package/pnetcdf/1.12.3 bisheng+mpi
+module load pnetcdf/1.12.3
 ./jarvis -install package/netcdf/4.7.4/clang bisheng+mpi
 module load netcdf-clang/4.7.4
 export NETCDFROOT=$NETCDF_CLANG_PATH
@@ -28,14 +28,15 @@ export NETCDFROOT=$NETCDF_CLANG_PATH
 [ENV]
 module purge
 module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles
-module add bisheng/compiler${BISHENG_VERSION}/bishengmodule bisheng/hmpi${HMPI_VERSION}/hmpi
-export CC=`which clang`
-export CXX=`which clang++`
-export FC=`which flang`
-export CC=mpicc CXX=mpicxx FC=mpifort F77=mpifort
-module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}-hmpi24.12.30
+module load bisheng/compiler${BISHENG_VERSION}/bishengmodule
+module load bisheng/hmpi${HPCKIT_VERSION}/release
+export CC=`which mpicc`
+export CXX=`which mpicxx`
+export FC=`which mpifort`
+export F77=`which mpifort`
+module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION}
 module load hdf5-clang/1.12.0
-module load pnetcdf/1.14.0
+module load pnetcdf/1.12.3
 module load netcdf-clang/4.7.4
 export NETCDFROOT=$NETCDF_CLANG_PATH
 
@@ -49,17 +50,16 @@ case_dir =
 set -e
 set -x
 
-
-module list
-
 cd ${JARVIS_TMP}
 rm -rf swan
-git clone https://github.com/abby-1225/swan.git
+git clone https://github.com/abby-1225/swan.git 
 cd ${JARVIS_ROOT}
+rm -rf swan4131
 tar -xf ${JARVIS_TMP}/swan/swan4131.tar.gz
 cd swan4131
 sed -i '788s/\$_/"gfortran"/' platform.pl
-export FC=gfortran && make config
+export FC=gfortran
+make config
 sed -i "4s/gfortran/flang/" macros.inc
 sed -i "8s/-w/-w -mcpu=linxicore9100 -mllvm -force-customized-pipeline=true/" macros.inc
 sed -i "14s/=/= \$(NETCDF_CLANG_PATH)/" macros.inc
@@ -72,3 +72,4 @@ nodes = 1
 
 [BATCH]
 #! /bin/bash
+
-- 
Gitee