diff --git a/apps/wrf/install_wrf_omp_openmpi.sh b/apps/wrf/install_wrf_omp_openmpi.sh index 428f97179..6f8551550 100755 --- a/apps/wrf/install_wrf_omp_openmpi.sh +++ b/apps/wrf/install_wrf_omp_openmpi.sh @@ -1,12 +1,13 @@ #!/bin/bash APP_NAME=wrf -APP_VERSION=4.1.3 +APP_VERSION=4.1.5 SKU_TYPE=${SKU_TYPE:-hb} SHARED_APP=${SHARED_APP:-/apps} MODULE_DIR=${SHARED_APP}/modulefiles/${SKU_TYPE}/${APP_NAME} MODULE_NAME=${APP_VERSION}-omp-openmpi APP_DIR=$SHARED_APP/${SKU_TYPE}/${APP_NAME}-omp-openmpi +OPENMPI_VER=4.0.3 APPS_WRF_DIR=`pwd` function create_modulefile { @@ -24,7 +25,7 @@ EOF sudo yum install -y jasper-devel sudo yum install -y libpng-devel -spack install netcdf-fortran+mpi ^netcdf~parallel-netcdf ^hdf5+fortran %gcc@9.2.0 ^openmpi@4.0.2 +spack install netcdf-fortran+mpi ^hdf5+fortran %gcc@9.2.0 ^openmpi@${OPENMPI_VER} source ${SPACK_ROOT}/share/spack/setup-env.sh mkdir -p ${APP_DIR} @@ -33,16 +34,15 @@ wget https://github.com/wrf-model/WRF/archive/v${APP_VERSION}.tar.gz tar xvf v${APP_VERSION}.tar.gz spack load netcdf-fortran^openmpi -spack load netcdf^openmpi spack load hdf5^openmpi spack load perl -module load mpi/openmpi-4.0.2 +module load mpi/openmpi-${OPENMPI_VER} module load gcc-9.2.0 export HDF5=$(spack location -i hdf5^openmpi) export NETCDF=$(spack location -i netcdf-fortran^openmpi) -NETCDF_C=$(spack location -i netcdf^openmpi) +NETCDF_C=$(spack location -i netcdf-c^openmpi) ln -sf $NETCDF_C/include/* $NETCDF/include/ ln -sf $NETCDF_C/lib/* $NETCDF/lib/ ln -sf $NETCDF_C/lib/pkgconfig/* $NETCDF/lib/pkgconfig diff --git a/apps/wrf/install_wrf_openmpi.sh b/apps/wrf/install_wrf_openmpi.sh index a30784859..a1bea1c27 100755 --- a/apps/wrf/install_wrf_openmpi.sh +++ b/apps/wrf/install_wrf_openmpi.sh @@ -1,12 +1,13 @@ #!/bin/bash APP_NAME=wrf -APP_VERSION=4.1.3 +APP_VERSION=4.1.5 SKU_TYPE=${SKU_TYPE:-hb} SHARED_APP=${SHARED_APP:-/apps} MODULE_DIR=${SHARED_APP}/modulefiles/${SKU_TYPE}/${APP_NAME} MODULE_NAME=${APP_VERSION}-openmpi APP_DIR=$SHARED_APP/${SKU_TYPE}/${APP_NAME}-openmpi +OPENMPI_VER=4.0.3 APPS_WRF_DIR=`pwd` function create_modulefile { @@ -24,7 +25,7 @@ EOF sudo yum install -y jasper-devel sudo yum install -y libpng-devel -spack install netcdf-fortran+mpi ^netcdf~parallel-netcdf ^hdf5+fortran %gcc@9.2.0 ^openmpi@4.0.2 +spack install netcdf-fortran+mpi ^hdf5+fortran %gcc@9.2.0 ^openmpi@${OPENMPI_VER} source ${SPACK_ROOT}/share/spack/setup-env.sh mkdir -p ${APP_DIR} @@ -33,16 +34,15 @@ wget https://github.com/wrf-model/WRF/archive/v${APP_VERSION}.tar.gz tar xvf v${APP_VERSION}.tar.gz spack load netcdf-fortran^openmpi -spack load netcdf^openmpi spack load hdf5^openmpi spack load perl -module load mpi/openmpi-4.0.2 +module load mpi/openmpi-${OPENMPI_VER} module load gcc-9.2.0 export HDF5=$(spack location -i hdf5^openmpi) export NETCDF=$(spack location -i netcdf-fortran^openmpi) -NETCDF_C=$(spack location -i netcdf^openmpi) +NETCDF_C=$(spack location -i netcdf-c^openmpi) ln -sf $NETCDF_C/include/* $NETCDF/include/ ln -sf $NETCDF_C/lib/* $NETCDF/lib/ ln -sf $NETCDF_C/lib/pkgconfig/* $NETCDF/lib/pkgconfig diff --git a/apps/wrf/run_wrf_openmpi.pbs b/apps/wrf/run_wrf_openmpi.pbs index 85c6fc364..c2a1e88ba 100755 --- a/apps/wrf/run_wrf_openmpi.pbs +++ b/apps/wrf/run_wrf_openmpi.pbs @@ -1,14 +1,15 @@ #!/bin/bash -export MODULEPATH=/apps/modulefiles/${SKU_TYPE}:$MODULEPATH +SHARED_APP=${SHARED_APP:-/apps} + +export MODULEPATH=${SHARED_APP}/modulefiles/${SKU_TYPE}:$MODULEPATH spack load netcdf-fortran^openmpi -spack load netcdf^openmpi spack load hdf5^openmpi spack load perl -module load mpi/openmpi-4.0.2 +module load mpi/openmpi-4.0.3 module load gcc-9.2.0 -module load wrf/4.1.3-openmpi +module load wrf/4.1.5-openmpi which mpicc which wrf.exe