Merge pull request #1785 from GEOS-ESM/hotfix/mathomp4/1784-mpt-build…

…-issue

Fixes #1784. Fix build issue at NAS

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 $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
 # 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 $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
 # 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 ()

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
 

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

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

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)