mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '190-amrex-review' into 'master'

Browse Source 
Resolve "amrex: review"

Closes #190

See merge request Pmodules/buildblocks!261
This commit is contained in:
gsell
2021-11-19 09:17:13 +00:00
parent 78d17ddbef 1f05b56c94
commit 7d42c72c34
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MPI/amrex/build
View File

@@ -9,6 +9,12 @@ pbuild::install_docfiles 'INSTALL'
pbuild::install_docfiles 'license.txt'
pbuild::install_docfiles 'README.txt'
pbuild::pre_prep() {
echo "OPENMPI_VERSION=${OPENMPI_VEERSION}" 1>&2
if pbuild::version_gt "${OPENMPI_VERSION}" '4.0.0'; then
pbuild::add_patch "files/AMReX_ParallelDescriptor.patch"
fi
}
pbuild::pre_configure() {
pbuild::use_cmake
@@ -16,6 +22,13 @@ pbuild::pre_configure() {
pbuild::use_flag "2d" && DIM=2
pbuild::use_flag "3d" && DIM=3
if pbuild::version_lt "${OPENMPI_VERSION}" '4.0.0'; then
FORTRAN_INTERFACES='ON'
ENABLE_FBASELIB='ON'
else
FORTRAN_INTERFACES='OFF'
ENABLE_FBASELIB='OFF'
fi
pbuild::add_configure_args "CC=${MPICC}"
pbuild::add_configure_args "CXX=${MPICXX}"
pbuild::add_configure_args "FC=${MPIF90}"
@@ -29,8 +42,8 @@ pbuild::pre_configure() {
pbuild::add_configure_args "-DENABLE_OMP=${OPENMP}"
pbuild::add_configure_args "-DENABLE_DP=1"
pbuild::add_configure_args "-DENABLE_EB=OFF"
pbuild::add_configure_args "-DENABLE_FORTRAN_INTERFACES=ON"
pbuild::add_configure_args "-DENABLE_FBASELIB=1"
pbuild::add_configure_args "-DENABLE_FORTRAN_INTERFACES=${FORTRAN_INTERFACES}"
pbuild::add_configure_args "-DENABLE_FBASELIB=${ENABLE_FBASELIB}"
pbuild::add_configure_args "-DENABLE_AMRDATA=OFF"
pbuild::add_configure_args "-DENABLE_DP_PARTICLES=1"
pbuild::add_configure_args "-DENABLE_FPE=0"

1
MPI/amrex/files/variants.merlin6
View File

@@ -1,2 +1,3 @@
amrex/18.07_3d_slurm stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm b:cmake/3.15.5
amrex/18.07_3d_slurm stable gcc/10.3.0 openmpi/4.0.5-1_slurm b:cmake/3.20.5

3
MPI/amrex/files/variants.rhel6
View File

@@ -14,5 +14,6 @@ amrex/18.07_3d deprecated gcc/8.2.0 openmpi/{1.10.7,2.1.5,3.1.3} b:cmake/3.9.6
amrex/18.07_3d stable gcc/{7.3.0,8.2.0} mpich/3.2.1 b:cmake/3.9.6
amrex/18.07_3d stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6 b:cmake/3.15.5
amrex/18.07_3d stable gcc/{7.5.0,8.4.0,9.3.0,10.3.0} openmpi/3.1.6 b:cmake/3.15.5
amrex/18.07_3d stable gcc/{7.5.0,8.4.0,9.3.0,10.3.0} openmpi/4.0.5 b:cmake/3.15.5