diff --git a/README.md b/README.md index fadee3c1cc6752d4a0fb804b21d235da441ad7a2..9fde4c28ea179293dc467aaa392d57d787887b9f 100644 --- a/README.md +++ b/README.md @@ -168,10 +168,9 @@ A: 步骤3:在原来环境下进行后续安装操作 ``` -Q2:软件会安装到哪里? +Q2:软件安装目录在哪里? ``` -A: -按照模板开发规则,应用在使用jarvis安装后,会安装的${JARVIS_TMP}目录,默认情况,为保障安装速度,${JARVIS_TMP}路径为 ‘/tmp’,如果需要修改${JARVIS_TMP}指向路径可修改init.sh,并重新source +A:参考“option介绍”小节中的安装目录 ``` # 欢迎贡献 小的改进或修复总是值得赞赏的,可以提交一个issue或者在hpc.openeuler.org进行讨论。 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 295a81f8c90c8b895bb0b4ad11be6a5cb40ce5af..60d69be4aa5fed43587c918b998330c25776d125 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