diff --git a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config index 5e787fb4122956fe64ade0a4454337f97918350e..cfc2e132f334e269f25d3de9e368785e99276b7d 100644 --- a/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config +++ b/templates/wrf/4.2/bisheng/data.wrf.arm.cpu.config @@ -10,16 +10,16 @@ set -e set -x # basic system components module purge -./jarvis -install hpckit/${HPCKIT_VERSION} com -module use ./software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/latest/modulefiles -module load bisheng/compiler4.2.0/bishengmodule -module load bisheng/hmpi25.0.0/hmpi +./jarvis -install hpckit/${HPCKIT_VERSION} any +module use ./software/utils/hpckit/${HPCKIT_VERSION}/HPCKit/latest/modulefiles +module load bisheng/compiler${BISHENG_VERSION}/bishengmodule +module load bisheng/hmpi${HMPI_VERSION}/release export CC="clang -Wno-implicit-function-declaration -Wno-incompatible-function-pointer-types" CXX=clang++ FC=flang ./jarvis -install jasper/1.900.2 clang -module use ./software/moduledeps/bisheng4.2.0 +module use ./software/moduledeps/bisheng${BISHENG_VERSION} module load jasper/1.900.2 export CC=mpicc CXX=mpicxx FC=mpifort -module use ./software/moduledeps/bisheng4.2.0-hmpi25.0.0 +module use ./software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION} ./jarvis -install hdf5/1.12.0/clang clang+mpi module load hdf5-clang/1.12.0 ./jarvis -install pnetcdf/1.12.1 clang+mpi @@ -34,13 +34,13 @@ fi #!/bin/bash module purge module use ${JARVIS_ROOT}//software/compiler/hpckit/${HPCKIT_VERSION}/HPCKit/latest/modulefiles -module load bisheng/compiler4.2.0/bishengmodule -module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.2.0 -module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.2.0-hmpi25.0.0 +module load bisheng/compiler${BISHENG_VERSION}/bishengmodule +module use ${JARVIS_ROOT}/software/moduledeps/bisheng${BISHENG_VERSION} +module use ${JARVIS_ROOT}/software/moduledeps/bisheng${BISHENG_VERSION}-hmpi${HMPI_VERSION} module load jasper/1.900.2 -module load bisheng/hmpi25.0.0/hmpi +module load bisheng/hmpi${HMPI_VERSION}/release module load hdf5-clang/1.12.0 pnetcdf/1.12.1 netcdf-clang/4.7.4 -module load bisheng/kml25.0.0/kml +module load bisheng/kml${HPCKIT_VERSION}/kml export WRFIO_NCD_LARGE_FILE_SUPPORT=1 export NETCDF=$NETCDF_CLANG_PATH export HDF5=$HDF5_CLANG_PATH @@ -55,7 +55,7 @@ export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 F90=mpif90 export WRF_DIR=$JARVIS_ROOT/WRF-4.2 export MPI_LIB="-L$JARVIS_COMPILER/hpckit/${HPCKIT_VERSION}/HPCKit/latest/hmpi/bisheng/hmpi/lib -lmpi -lomp" export INCLUDE=$WRF_DIR/include:$INCLUDE -export KML_LIB=$JARVIS_COMPILER/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng/lib/noarch +export KML_LIB=$JARVIS_UTILS/hpckit/${HPCKIT_VERSION}/HPCKit/latest/kml/bisheng/lib/noarch [APP] app_name = WRF @@ -65,6 +65,8 @@ binary_dir = case_dir = ${JARVIS_ROOT}/conus12km/ [BUILD] +set -x +set -e cat << \EOF > ./arch/configure.defaults ########################################################### #ARCH Linux aarch64,clang HYPERMPI#serial smpar dmpar dm+sm