diff --git a/templates/swan/41.51/swan.arm.bisheng.cpu.config b/templates/swan/41.51/swan.arm.bisheng.cpu.config index 4bf154c0f36012d2679dfa24d2c35e621499247b..1e8b6ea3c4eef9dda1cac42dd6919bd55c89aa68 100644 --- a/templates/swan/41.51/swan.arm.bisheng.cpu.config +++ b/templates/swan/41.51/swan.arm.bisheng.cpu.config @@ -10,15 +10,16 @@ set -x set -e module purge -./jarvis -install hpckit/${HPCKIT_VERSION} com -module use ./software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles -module add bisheng/compiler4.2.0/bishengmodule bisheng/hmpi25.0.0/hmpi +./jarvis -install hpckit/${HPCKIT_VERSION} any +module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles +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 hdf5/1.12.0/clang bisheng+mpi -module use ./software/moduledeps/bisheng4.2.0-hmpi25.0.0 +module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION} module load hdf5-clang/1.12.0 ./jarvis -install pnetcdf/1.12.3 bisheng+mpi module load pnetcdf/1.12.3 @@ -33,13 +34,14 @@ tar -vzxf ${JARVIS_DOWNLOAD}/refrac.tar.gz [ENV] module purge -module use ./software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles -module add bisheng/compiler4.2.0/bishengmodule bisheng/hmpi25.0.0/hmpi +module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/${HPCKIT_VERSION}/modulefiles +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/bisheng4.2.0-hmpi25.0.0 +module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HPCKIT_VERSION} module load hdf5-clang/1.12.0 module load pnetcdf/1.12.3 module load netcdf-clang/4.7.4 @@ -76,3 +78,4 @@ nodes = 1 [BATCH] #! /bin/bash +