From 58659018b152e89a408804459d62cd6253660a50 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 7 Nov 2022 11:37:06 -0800 Subject: [PATCH] Fixes #1784. Fix build issue at NAS --- Apps/CMakeLists.txt | 18 ++++++++++-------- Apps/time_ave_util.F90 | 6 +++--- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- base/CMakeLists.txt | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Apps/CMakeLists.txt b/Apps/CMakeLists.txt index 0e047d741fa7..93eb30c743e9 100644 --- a/Apps/CMakeLists.txt +++ b/Apps/CMakeLists.txt @@ -15,16 +15,18 @@ install (PROGRAMS TYPE SYSCONF ) -ecbuild_add_executable (TARGET Regrid_Util.x SOURCES Regrid_Util.F90 DEPENDS esmf ) -target_link_libraries (Regrid_Util.x PRIVATE MAPL ${MPI_Fortran_LIBRARIES}) +ecbuild_add_executable (TARGET Regrid_Util.x SOURCES Regrid_Util.F90) +target_link_libraries (Regrid_Util.x PRIVATE MAPL MPI::MPI_Fortran esmf) +target_include_directories (Regrid_Util.x PRIVATE $) # CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280 if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG") - target_link_libraries(Regrid_Util.x PRIVATE OpenMP::OpenMP_Fortran) - endif () + target_link_libraries(Regrid_Util.x PRIVATE OpenMP::OpenMP_Fortran) +endif () -ecbuild_add_executable (TARGET time_ave_util.x SOURCES time_ave_util.F90 DEPENDS esmf ) -target_link_libraries (time_ave_util.x PRIVATE MAPL ${MPI_Fortran_LIBRARIES}) +ecbuild_add_executable (TARGET time_ave_util.x SOURCES time_ave_util.F90) +target_link_libraries (time_ave_util.x PRIVATE MAPL MPI::MPI_Fortran esmf) +target_include_directories (time_ave_util.x PRIVATE $) # CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280 if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG") - target_link_libraries(time_ave_util.x PRIVATE OpenMP::OpenMP_Fortran) - endif () + target_link_libraries(time_ave_util.x PRIVATE OpenMP::OpenMP_Fortran) +endif () diff --git a/Apps/time_ave_util.F90 b/Apps/time_ave_util.F90 index 746df4dd8963..7051279e5e68 100644 --- a/Apps/time_ave_util.F90 +++ b/Apps/time_ave_util.F90 @@ -1428,7 +1428,7 @@ subroutine latlon_zmean ( q,qz,undef,grid,rc) real, allocatable :: qg(:,:) real, allocatable :: buf(:,:) real :: qsum - integer :: mpi_status(mpi_status_size) + integer :: mpistatus(mpi_status_size) integer, allocatable :: ims(:),jms(:) integer j,n,peid,peid0,i1,j1,in,jn,mypet,i_start,i_end,isum type(ESMF_VM) :: vm @@ -1453,7 +1453,7 @@ subroutine latlon_zmean ( q,qz,undef,grid,rc) do n=1,nx-1 allocate(buf(ims(n+1),jm)) peid = mypet + n - call mpi_recv(buf,ims(n+1)*jm,MPI_FLOAT,peid,peid,MPI_COMM_WORLD,mpi_status,status) + call mpi_recv(buf,ims(n+1)*jm,MPI_FLOAT,peid,peid,MPI_COMM_WORLD,mpistatus,status) _VERIFY(status) i_start=i_end+1 i_end = i_start+ims(n)-1 @@ -1484,7 +1484,7 @@ subroutine latlon_zmean ( q,qz,undef,grid,rc) _VERIFY(status) enddo else - call mpi_recv(qz,jm,MPI_FLOAT,peid0,peid0,MPI_COMM_WORLD,mpi_status,status) + call mpi_recv(qz,jm,MPI_FLOAT,peid0,peid0,MPI_COMM_WORLD,mpistatus,status) _VERIFY(status) end if diff --git a/CHANGELOG.md b/CHANGELOG.md index bdd9e52a4e5e..6b693509a9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated +## [2.30.1] - 2022-11-07 + +### Fixed + +- Fix for building `time_ave_util.x` at NAS using MPT + ## [2.30.0] - 2022-11-03 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index abe0027bb999..420150d4ab93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( MAPL - VERSION 2.30.0 + VERSION 2.30.1 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the default build type to release diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 0e7c368f92d4..1a427456eb71 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -82,7 +82,7 @@ foreach(dir ${OSX_EXTRA_LIBRARY_PATH}) endforeach() ecbuild_add_executable (TARGET cub2latlon.x SOURCES cub2latlon_regridder.F90 DEPENDS esmf MAPL.shared) -target_link_libraries (cub2latlon.x PRIVATE ${this} MAPL.pfio ${MPI_Fortran_LIBRARIES}) +target_link_libraries (cub2latlon.x PRIVATE ${this} MAPL.pfio MPI::MPI_Fortran) # CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280 if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG") target_link_libraries(cub2latlon.x PRIVATE OpenMP::OpenMP_Fortran)