From ba150fd7cc0215a46c6cdfd5db70ab01cd2cfe2a Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Mon, 10 Nov 2025 20:01:24 +0800 Subject: [PATCH 1/6] fix wrf 4.6.1 --- package/hpckit/meta.sh | 2 +- .../wannier90/3.1.0/data.wannier90.arm.cpu.kgcc.config | 2 +- templates/wrf/4.6.1/data.wrf.arm.cpu.config | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/hpckit/meta.sh b/package/hpckit/meta.sh index e822cd80..6b765ea1 100644 --- a/package/hpckit/meta.sh +++ b/package/hpckit/meta.sh @@ -28,4 +28,4 @@ export BISHENG_VERSION=`ls $file_path|grep compiler|awk -F "compiler" '{print $2 export HMPI_VERSION=`ls $file_path|grep hmpi|awk -F "hmpi" '{print $2}'` echo -e "HPCKit has installed in your environment." -echo -e "你正在使用 $HPCKIT_VERSION 版本的 HPCKKit" \ No newline at end of file +echo -e "你正在使用 $HPCKit_Version 版本的 HPCKKit" \ No newline at end of file diff --git a/templates/wannier90/3.1.0/data.wannier90.arm.cpu.kgcc.config b/templates/wannier90/3.1.0/data.wannier90.arm.cpu.kgcc.config index db75a20c..5b4b90ee 100644 --- a/templates/wannier90/3.1.0/data.wannier90.arm.cpu.kgcc.config +++ b/templates/wannier90/3.1.0/data.wannier90.arm.cpu.kgcc.config @@ -8,7 +8,7 @@ set -e set -x module purge -git clone $JARVIS_PROXY/wannier-developers/wannier90.git tmp/wannier90 +git clone https://github.com/wannier-developers/wannier90.git tmp/wannier90 ./jarvis -install kgcc/10.3.1 com module use ./software/modulefiles module load kgcc10 diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index d86d0c91..a84cf333 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -3,6 +3,7 @@ [DOWNLOAD] conus12km https://www2.mmm.ucar.edu/wrf/src/conus12km.tar.gz +wrf/4.6.1 https://github.com/HWsunqian0027/WRF/archive/refs/tags/v4.6.1.tar.gz WRFV4.6.1.tar.gz [DEPENDENCY] yum install tcsh time -y @@ -23,11 +24,7 @@ module load netcdf/4.7.4 ./jarvis -install optimized-routines/20.02 gcc module load optimized-routines/20.02 cd ${JARVIS_TMP} -rm -rf WRF -git clone https://github.com/wrf-model/WRF.git -cd WRF -git checkout tags/v4.6.1 -b wrf-4.6.1 -git submodule update --init --recursive +tar -xvf ${JARVIS_DOWNLOAD}/WRFV4.6.1.tar.gz [ENV] module purge -- Gitee From 9cfef78b1045a75350f2d9b09029e85d01cbb017 Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Mon, 10 Nov 2025 20:16:47 +0800 Subject: [PATCH 2/6] add 4.6.1 --- templates/wrf/4.6.1/data.wrf.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index a84cf333..99200df2 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -3,7 +3,7 @@ [DOWNLOAD] conus12km https://www2.mmm.ucar.edu/wrf/src/conus12km.tar.gz -wrf/4.6.1 https://github.com/HWsunqian0027/WRF/archive/refs/tags/v4.6.1.tar.gz WRFV4.6.1.tar.gz +wrf/4.6.1 https://github.com/HPC-code/WRF/archive/refs/tags/v4.6.1.tar.gz WRFV4.6.1.tar.gz [DEPENDENCY] yum install tcsh time -y -- Gitee From 53b788971efc98b526fb091ae66f9be398c1b0e4 Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Mon, 10 Nov 2025 21:09:21 +0800 Subject: [PATCH 3/6] add 4.6.1 --- package/pnetcdf/1.11.2/install.sh | 3 ++- package/pnetcdf/1.12.1/install.sh | 3 ++- package/pnetcdf/1.14.0/install.sh | 3 ++- package/pnetcdf/1.9.0/install.sh | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/install.sh index 11360041..961c3f87 100755 --- a/package/pnetcdf/1.11.2/install.sh +++ b/package/pnetcdf/1.11.2/install.sh @@ -3,7 +3,8 @@ set -x set -e pnetcdf_ver='1.11.2' -. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-${pnetcdf_ver}.tar.gz +#. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-${pnetcdf_ver}.tar.gz +. ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/pnetcdf/pnetcdf-1.11.2.tar.gz cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_ver}.tar.gz diff --git a/package/pnetcdf/1.12.1/install.sh b/package/pnetcdf/1.12.1/install.sh index 9c92026b..dbb2ad99 100755 --- a/package/pnetcdf/1.12.1/install.sh +++ b/package/pnetcdf/1.12.1/install.sh @@ -2,7 +2,8 @@ set -x set -e pnetcdf_version='1.12.1' -. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-${pnetcdf_version}.tar.gz +#. ${DOWNLOAD_TOOL} -u http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/pnetcdf-${pnetcdf_version}.tar.gz +. ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/pnetcdf/pnetcdf-1.12.1.tar.gz cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_version} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz diff --git a/package/pnetcdf/1.14.0/install.sh b/package/pnetcdf/1.14.0/install.sh index 5c10d3a7..feb1909b 100644 --- a/package/pnetcdf/1.14.0/install.sh +++ b/package/pnetcdf/1.14.0/install.sh @@ -2,7 +2,8 @@ set -x set -e pnetcdf_version='1.14.0' -. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/pnetcdf-${pnetcdf_version}.tar.gz +#. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/pnetcdf-${pnetcdf_version}.tar.gz +. ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/pnetcdf/pnetcdf-1.14.0.tar.gz cd ${JARVIS_TMP} tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz cd pnetcdf-${pnetcdf_version} diff --git a/package/pnetcdf/1.9.0/install.sh b/package/pnetcdf/1.9.0/install.sh index a4279a74..af2df9d5 100644 --- a/package/pnetcdf/1.9.0/install.sh +++ b/package/pnetcdf/1.9.0/install.sh @@ -3,7 +3,8 @@ set -x set -e pnetcdf_ver='1.9.0' -. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/parallel-netcdf-1.9.0.tar.gz +#. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/parallel-netcdf-1.9.0.tar.gz +. ${DOWNLOAD_TOOL} -u https://gitee.com/kp-hpc-mod/hpc-src/raw/master/pnetcdf/parallel-netcdf-1.9.0.tar.gz cd ${JARVIS_TMP} rm -rf pnetcdf-${pnetcdf_ver} tar zxvf ${JARVIS_DOWNLOAD}/parallel-netcdf-1.9.0.tar.gz -- Gitee From 5c8761a3e0801a40192830e9a7e0c05d5e52b33f Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Mon, 10 Nov 2025 21:14:51 +0800 Subject: [PATCH 4/6] add 4.6.1 --- templates/wrf/4.6.1/data.wrf.arm.cpu.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index 99200df2..1692a48b 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -45,7 +45,7 @@ case_dir = ${JARVIS_ROOT}/conus12km [BUILD] cd ${JARVIS_TMP} -cd WRF +cd WRF-4.6.1 export HDF5=`which h5diff` export HDF5=${HDF5%/*/*} export NETCDF=`nc-config --prefix` -- Gitee From c14fedcc8caf397d6d478ff47119f6d154032a9f Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Mon, 10 Nov 2025 21:17:01 +0800 Subject: [PATCH 5/6] add 4.6.1 --- templates/wrf/4.6.1/data.wrf.arm.cpu.config | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index 1692a48b..07976087 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -44,6 +44,7 @@ binary_dir = case_dir = ${JARVIS_ROOT}/conus12km [BUILD] +chmod -R 755 /tmp/WRF-4.6.1 cd ${JARVIS_TMP} cd WRF-4.6.1 export HDF5=`which h5diff` -- Gitee From dfbcfe2762f0b8104cede6853b87b5333ac713aa Mon Sep 17 00:00:00 2001 From: sunlock0653 Date: Tue, 11 Nov 2025 10:56:16 +0800 Subject: [PATCH 6/6] add 4.6.1 --- templates/wrf/4.6.1/data.wrf.arm.cpu.config | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/wrf/4.6.1/data.wrf.arm.cpu.config b/templates/wrf/4.6.1/data.wrf.arm.cpu.config index 07976087..96988950 100644 --- a/templates/wrf/4.6.1/data.wrf.arm.cpu.config +++ b/templates/wrf/4.6.1/data.wrf.arm.cpu.config @@ -47,6 +47,7 @@ case_dir = ${JARVIS_ROOT}/conus12km chmod -R 755 /tmp/WRF-4.6.1 cd ${JARVIS_TMP} cd WRF-4.6.1 +git init export HDF5=`which h5diff` export HDF5=${HDF5%/*/*} export NETCDF=`nc-config --prefix` @@ -102,9 +103,12 @@ CC_TOOLS = \$(SCC) ########################################################### #ARCH NULL EOF - +git add . +git commit -m "Initial commit" +git tag -a v4.6.1 -m "v4.6.1" echo 4 | ./configure -./compile em_real 2>&1 | tee -a compile.log +./compile -j em_real 2>&1 | tee -a compile.log +echo -e "wrf 已完成安装" cd ${JARVIS_ROOT} -- Gitee