From aa80a662d02423adf2678526624f190ffbe47caa Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 3 Oct 2024 15:58:58 -0400 Subject: [PATCH 1/3] Fixes for NVHPC 24.9 --- CHANGELOG.md | 2 ++ base/Base/Base_Base_implementation.F90 | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fddc034bb4bd..a23fbc0536a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Workaround for NVHPC 24.9 involving `use` statement in `block` construct + ### Removed ### Deprecated diff --git a/base/Base/Base_Base_implementation.F90 b/base/Base/Base_Base_implementation.F90 index 20b27e36deea..a070bee5cba3 100644 --- a/base/Base/Base_Base_implementation.F90 +++ b/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 From 5c246f4e7d633fde7ebd71e35bb0b45be3589b5d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 3 Oct 2024 16:09:00 -0400 Subject: [PATCH 2/3] Update changelog and cmake for 2.49 --- CHANGELOG.md | 14 ++++++++++---- CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a23fbc0536a6..f308d711d89d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +### Fixed + +### Removed + +### Deprecated + +## [2.49.0] - 2024-10-04 + +### Changed + - ExtDataDriver.x now uses ExtData2G by default - Update `components.yaml` - ecbuild geos/v1.4.0 @@ -20,10 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Workaround for NVHPC 24.9 involving `use` statement in `block` construct -### Removed - -### Deprecated - ## [2.48.0] - 2024-09-24 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 212ffb6e0d23..0f06772e49dc 100644 --- a/CMakeLists.txt +++ b/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 From 5a670389768d0876646e5684d1c6c2cb07d06ae9 Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Thu, 3 Oct 2024 16:39:42 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ad19717987d..6e5c62c38ab8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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 - ### Changed ### Fixed @@ -23,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [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 + ### Changed - ExtDataDriver.x now uses ExtData2G by default