Merge branch 'develop' into release/MAPL-v3

CHANGELOG.md

@@ -110,6 +110,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.50.3] - 2024-12-02
+
+### Fixed
+
+- Fixed bug where c null character is not removed from end of string when reading netcdf attribute in NetCDF4\_FileFormatter.F90
+
 ## [2.50.2] - 2024-10-30
 
 ### Fixed

CMakeLists.txt

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

pfio/NetCDF4_FileFormatter.F90

@@ -20,6 +20,7 @@ module pFIO_NetCDF4_FileFormatterMod
    use pfio_NetCDF_Supplement
    use netcdf
    use mpi
+   use, intrinsic :: iso_c_binding, only: C_NULL_CHAR
    implicit none
    private
 
@@ -987,6 +988,9 @@ subroutine inq_attributes(this, cf, varid, unusable, rc)
             status = nf90_get_att(this%ncid, varid, trim(attr_name), str)
             !$omp end critical
             _VERIFY(status)
+            if (len > 0) then
+               if (str(len:len) == C_NULL_CHAR) str = str(1:len-1)
+            end if
             call cf%add_attribute(trim(attr_name), str)
             deallocate(str)
          case (NF90_STRING)
@@ -1083,6 +1087,9 @@ subroutine inq_var_attributes(this, var, varid, unusable, rc)
             status = nf90_get_att(this%ncid, varid, trim(attr_name), str)
             !$omp end critical
             _VERIFY(status)
+            if (len > 0) then
+               if (str(len:len) == C_NULL_CHAR) str = str(1:len-1)
+            end if
             call var%add_attribute(trim(attr_name), str)
             deallocate(str)
          case (NF90_STRING)