From 831dcf103f36830ae3d90d6e6e7074885c8387b3 Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 06:56:32 +0000 Subject: [PATCH 1/8] update templates/wrf/4.7.1/data.wrf.arm.cpu.config. Signed-off-by: DFRJ --- templates/wrf/4.7.1/data.wrf.arm.cpu.config | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/templates/wrf/4.7.1/data.wrf.arm.cpu.config b/templates/wrf/4.7.1/data.wrf.arm.cpu.config index 295a81f8..60d69be4 100644 --- a/templates/wrf/4.7.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.7.1/data.wrf.arm.cpu.config @@ -10,9 +10,9 @@ set -x module purge if [[ $UseLatest -eq 1 ]]; then -HPCKit_Version=latest + HPCKit_Version=latest else -HPCKit_Version=25.0.0 + HPCKit_Version=25.0.0 fi ./jarvis -install hpckit/${HPCKit_Version}/ any @@ -22,9 +22,7 @@ module use software/utils/hpckit/${HPCKit_Version}/HPCKit/${HPCKit_Version}/modu module load bisheng/compiler${BISHENG_VERSION}/bishengmodule module load bisheng/hmpi${HMPI_VERSION} - # basic system components - export CC=clang CXX=clang++ FC=flang export CFLAGS="-Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types" ./jarvis -install jasper/1.900.2 bisheng @@ -43,25 +41,22 @@ module load bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/pnetcdf/1.14.0 module load bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/netcdf-clang/4.9.3 tar -xvf ${JARVIS_DOWNLOAD}/WRFV4.7.1.tar.gz - [ENV] #!/bin/bash module purge if [[ $UseLatest -eq 1 ]]; then -HPCKit_Version=latest + HPCKit_Version=latest else -HPCKit_Version=25.0.0 + HPCKit_Version=25.0.0 fi -./jarvis -install hpckit/${HPCKit_Version}/ any BISHENG_VERSION=`ls software/utils/hpckit/${HPCKit_Version}/HPCKit/${HPCKit_Version}/modulefiles/bisheng|grep compiler|awk -F "compiler" '{print $2}'` HMPI_VERSION=`ls software/utils/hpckit/${HPCKit_Version}/HPCKit/${HPCKit_Version}/modulefiles/bisheng|grep hmpi|awk -F "hmpi" '{print $2}'` module use software/utils/hpckit/${HPCKit_Version}/HPCKit/${HPCKit_Version}/modulefiles module load bisheng/compiler${BISHENG_VERSION}/bishengmodule module load bisheng/hmpi${HMPI_VERSION} - -module use /hpcrunner/software/moduledeps +module use software/module* module load bisheng${BISHENG_VERSION}/jasper/1.900.2 module load bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/hdf5-clang/1.13.0 module load bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION}/pnetcdf/1.12.1 @@ -78,12 +73,12 @@ export JASPREINC=${JASPER_PATH}/include export CPPFLAGS="-I${HDF5}/include -I${PNETCDF}/include -I${NETCDF}/include" export LDFLAGS="-L${HDF5}/lib -L${PNETCDF}/lib -L${NETCDF}/lib -lnetcdf -lnetcdff -lpnetcdf -lhdf5_hl -lhdf5 -lz" export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 F90=mpif90 -export WRF_DIR=/hpcrunner/WRFV4.7.1 +export WRF_DIR=${JARVIS_ROOT}/WRFV4.7.1 export MPI_LIB="-L${HMPI_PATH}/lib -lmpi -lomp" export INCLUDE=${WRF_DIR}/include:$INCLUDE export KML_LIB=${KML_BISHENG_PATH}/lib export CASE_DIR=${WRF_DIR}/case/conus12km -export PATH=/hpcrunner/WRFV4.7.1/main:/hpcrunner/WRFV4.7.1/external/io_netcdf:$PATH +export PATH=${JARVIS_ROOT}/WRFV4.7.1/main:${JARVIS_ROOT}/WRFV4.7.1/external/io_netcdf:$PATH [APP] app_name = WRF -- Gitee From 2d0de2a6e0bccba5cab8072a6b253412b5f8485c Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:12:01 +0000 Subject: [PATCH 2/8] update README.md. Signed-off-by: DFRJ --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fadee3c1..eb99f114 100644 --- a/README.md +++ b/README.md @@ -168,10 +168,10 @@ A： 步骤3：在原来环境下进行后续安装操作 ``` -Q2：软件会安装到哪里？ +Q2：软件安装目录在哪里？ ``` A： -按照模板开发规则，应用在使用jarvis安装后，会安装的${JARVIS_TMP}目录，默认情况，为保障安装速度，${JARVIS_TMP}路径为 ‘/tmp’，如果需要修改${JARVIS_TMP}指向路径可修改init.sh,并重新source +参考[软件安装目录](## option介绍) ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee From bcc9f2cff5317a5014d3afe158d6e383ce2c127e Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:13:17 +0000 Subject: [PATCH 3/8] update README.md. Signed-off-by: DFRJ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb99f114..bda6eb4a 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ A： Q2：软件安装目录在哪里？ ``` A： -参考[软件安装目录](## option介绍) +参考[软件安装目录](#option介绍) ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee From 40cb3a580c080a82b0973c3cb433f81b20036368 Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:17:09 +0000 Subject: [PATCH 4/8] update README.md. Signed-off-by: DFRJ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bda6eb4a..43c949af 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ source init.sh | 一键生成Singularity容器定义文件 | ./jarvis -container docker-hub-address | 需要事先指定应用配置./jarvis -use data.config
参数"docker-hub-address"指定基础镜像
示例：./jarvis -container openeuler/openeuler | | 更新依赖库的路径 | ./jarvis -u | 如果移动了贾维斯的路径，将自动更新software/modulefiles的路径 | -## option介绍 +## option介绍{#option介绍} option支持列表如下所示 | **选项值** | **解释** | **安装目录** | -- Gitee From 4f0b02bb9f3d5f529f5a5aa43e2fb3fa7406f11f Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:30:02 +0000 Subject: [PATCH 5/8] update README.md. Signed-off-by: DFRJ --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43c949af..6b33ad22 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ source init.sh | 一键生成Singularity容器定义文件 | ./jarvis -container docker-hub-address | 需要事先指定应用配置./jarvis -use data.config
参数"docker-hub-address"指定基础镜像
示例：./jarvis -container openeuler/openeuler | | 更新依赖库的路径 | ./jarvis -u | 如果移动了贾维斯的路径，将自动更新software/modulefiles的路径 | -## option介绍{#option介绍} +## option介绍 option支持列表如下所示 | **选项值** | **解释** | **安装目录** | @@ -171,7 +171,7 @@ A： Q2：软件安装目录在哪里？ ``` A： -参考[软件安装目录](#option介绍) +[软件安装目录](#option介绍) ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee From 5fa79879b230e85b1034437e82e936c6c69b1799 Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:30:38 +0000 Subject: [PATCH 6/8] update README.md. Signed-off-by: DFRJ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b33ad22..316bd819 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ A： Q2：软件安装目录在哪里？ ``` A： -[软件安装目录](#option介绍) +[软件安装目录](#option介绍)[贡献方法](README_CONTRIBUTING.md) ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee From c678cdec0ddd847088f154da29820ecf0e5321b3 Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:36:39 +0000 Subject: [PATCH 7/8] update README.md. Signed-off-by: DFRJ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 316bd819..6d149d51 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ A： Q2：软件安装目录在哪里？ ``` A： -[软件安装目录](#option介绍)[贡献方法](README_CONTRIBUTING.md) +参考“option介绍”小节中的安装目录 ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee From fbe614ccf52b2a4f97ee6458c451c935ddc877a7 Mon Sep 17 00:00:00 2001 From: DFRJ Date: Tue, 5 Aug 2025 07:37:09 +0000 Subject: [PATCH 8/8] update README.md. Signed-off-by: DFRJ --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6d149d51..9fde4c28 100644 --- a/README.md +++ b/README.md @@ -170,8 +170,7 @@ A： Q2：软件安装目录在哪里？ ``` -A： -参考“option介绍”小节中的安装目录 +A：参考“option介绍”小节中的安装目录 ``` # 欢迎贡献 小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 -- Gitee