Merge pull request #3068 from GEOS-ESM/bugfix/mathomp4/nvhpc-fixes-20…

…24Oct03

Workarounds for NVHPC 24.9

CHANGELOG.md

@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+### Deprecated
+
+## [2.49.0] - 2024-10-04
+
+### Added
+
 - Added zstandard compression support
   - Note this requires netCDF-C to have been compiled with zstandard support. We have a CMake test to check for this
     and enabling zstandard output in History will fail if the library does not support it
@@ -22,9 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-### Removed
-
-### Deprecated
+- Workaround for NVHPC 24.9 involving `use` statement in `block` construct
 
 ## [2.48.0] - 2024-09-24
 

CMakeLists.txt

@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.48.0
+  VERSION 2.49.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

base/Base/Base_Base_implementation.F90

@@ -1954,6 +1954,7 @@ module function MAPL_LatLonGridCreate (Name, vm,                 &
 
     block
       use MAPL_Constants, only: MAPL_DEGREES_TO_RADIANS_R8
+      use iso_fortran_env, only: REAL64
       real(kind=REAL64), allocatable :: lons(:)
       real(kind=REAL64), allocatable :: lats(:)
 
@@ -2599,7 +2600,7 @@ module subroutine MAPL_GetHorzIJIndex(npts,II,JJ,lon,lat,lonR8,latR8,Grid, rc)
     type(ESMF_CoordSys_Flag) :: coordSys
     character(len=ESMF_MAXSTR) :: grid_type
 
-    _RETURN_IF(npts == 0 ) 
+    _RETURN_IF(npts == 0 )
     ! if the grid is present then we can just get the prestored edges and the dimensions of the grid
     ! this also means we are running on a distributed grid
     ! if grid not present then the we just be running outside of ESMF and the user must