diff --git a/package/hpckit/meta.sh b/package/hpckit/meta.sh index e822cd80ad1e4d84e4e38a69a1920f12c4003ecb..6b765ea153fbc96d52c7c3970490aa229846d4da 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/package/pnetcdf/1.11.2/install.sh b/package/pnetcdf/1.11.2/install.sh index 113600414e03af619e9cc196984e6963539ff201..961c3f87dcb21dc2f560fdf69848521e7fcd1a34 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 9c92026beabf60748990ac3b8a3200acd61f87e9..dbb2ad9993da37b6c3b63b0d600fe81a40344332 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 5c10d3a7fd8f71265749155476b0b94fc498b5b5..feb1909b80d633185f620ece1e78b3713b3c6202 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 a4279a74d830884b1c91af1b4eda247caa969dc0..af2df9d51f59d5624fcd26779f2a5e2838bc8ea3 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 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 db75a20c40e11e86f830b051a2155216cb56004e..5b4b90eec5eaf4f0908f2db500b46658b40ec8ab 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 d86d0c91bfe47329611e7347ceaf524bd76cf08c..969889502bd5f1ec1f1f713d214c62246f166030 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/HPC-code/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 @@ -47,8 +44,10 @@ binary_dir = case_dir = ${JARVIS_ROOT}/conus12km [BUILD] +chmod -R 755 /tmp/WRF-4.6.1 cd ${JARVIS_TMP} -cd WRF +cd WRF-4.6.1 +git init export HDF5=`which h5diff` export HDF5=${HDF5%/*/*} export NETCDF=`nc-config --prefix` @@ -104,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}