PyPartMC 2.0.7__tar.gz → 2.0.8__tar.gz

{pypartmc-2.0.7 → pypartmc-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPartMC
-Version: 2.0.7
+Version: 2.0.8
 Summary: Python interface to PartMC
 Author-Email: "https://github.com/open-atmos/PyPartMC/graphs/contributors" <nriemer@illinois.edu>
 License-Expression: GPL-3.0

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/COPYRIGHT

@@ -3,7 +3,7 @@ The NetCDF Copyright.
 
 \page copyright Copyright
 
-Copyright 1993-2014 University Corporation for Atmospheric
+Copyright 1993-2025 University Corporation for Atmospheric
 Research/Unidata.
 
 Portions of this software were developed by the Unidata Program at the 

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/module_netcdf4_nc_interfaces.F90

@@ -310,13 +310,13 @@ Interface
 
  USE ISO_C_BINDING, ONLY: C_INT, C_SIZE_T, C_CHAR
 
- Integer(C_INT),         VALUE         :: ncid, ndims
- Integer(C_INT),         VALUE         :: xtype, field_typeid  ! nc_type in C
- Integer(C_SIZE_T),      VALUE         :: offset
- Character(KIND=C_CHAR), Intent(IN)    :: name(*)
- Integer(C_INT),         Intent(INOUT) :: dim_sizes(*)
+ Integer(C_INT),         VALUE      :: ncid, ndims
+ Integer(C_INT),         VALUE      :: xtype, field_typeid  ! nc_type in C
+ Integer(C_SIZE_T),      VALUE      :: offset
+ Character(KIND=C_CHAR), Intent(IN) :: name(*)
+ Integer(C_INT),         Intent(IN) :: dim_sizes(*)
 
- Integer(C_INT)                        :: nc_insert_array_compound_f
+ Integer(C_INT)                     :: nc_insert_array_compound_f
 
  End Function nc_insert_array_compound_f
 End Interface

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/module_netcdf4_nf_interfaces.F90

@@ -217,10 +217,10 @@ Interface
  Function nf_insert_array_compound( ncid, xtype, name, offset, field_typeid, &
                                     ndims, dim_sizes) RESULT (status)
 
- Integer,          Intent(IN)    :: ncid, xtype, field_typeid, offset, ndims
- Integer,          Intent(INOUT) :: dim_sizes(*)
- Character(LEN=*), Intent(IN)    :: name
- Integer                         :: status
+ Integer,          Intent(IN) :: ncid, xtype, field_typeid, offset, ndims
+ Integer,          Intent(IN) :: dim_sizes(*)
+ Character(LEN=*), Intent(IN) :: name
+ Integer                      :: status
 
  End Function nf_insert_array_compound
 End Interface
@@ -483,9 +483,9 @@ Interface
  Function nf_def_var_chunking( ncid, varid, contiguous, chunksizes) &
                                RESULT(status)
 
- Integer, Intent(IN)    :: ncid, varid, contiguous
- Integer, Intent(INOUT) :: chunksizes(*)
- Integer                :: status
+ Integer, Intent(IN) :: ncid, varid, contiguous
+ Integer, Intent(IN) :: chunksizes(*)
+ Integer             :: status
 
  End Function nf_def_var_chunking
 End Interface

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/module_netcdf_nc_data.F90

@@ -314,6 +314,7 @@ Module netcdf_nc_data
  Integer(C_INT), Parameter :: NC_FATAL   = 1
  Integer(C_INT), Parameter :: NC_VERBOSE = 2
 
+#define USE_NETCDF4
 #ifdef USE_NETCDF4
 
 !                          NETCDF4 data

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/netcdf4_eightbyte.F90

@@ -3,10 +3,10 @@ function nf90_put_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
   integer (kind = EightByteInt), dimension(:), intent( in) :: values
   integer, dimension(:), optional, intent( in) :: start, count, stride, map
   integer                                      :: nf90_put_var_1D_EightByteInt
-  
+
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
   integer                               :: numDims, counter, format_num
-  
+
   ! Set local arguments to default values
   numDims                 = size(shape(values))
   localStart (:         ) = 1
@@ -14,7 +14,7 @@ function nf90_put_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
-  
+
   if(present(start))  localStart (:size(start) )  = start(:)
   if(present(count))  localCount (:size(count) )  = count(:)
   if(present(stride)) localStride(:size(stride)) = stride(:)
@@ -376,14 +376,15 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_1D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(1)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -395,6 +396,7 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_1D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_1D_EightByteInt = &
@@ -406,8 +408,10 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_1D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:) = reshape(defaultInt8Array(:), shape(values))
+        values(:) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_1D_EightByteInt = &
@@ -419,7 +423,8 @@ function nf90_get_var_1D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_1D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:) = reshape(defaultIntArray(:), shape(values))
+        values(:) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      endif
   endif
 end function nf90_get_var_1D_EightByteInt
@@ -433,14 +438,15 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_2D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(2)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -452,6 +458,7 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_2D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_2D_EightByteInt = &
@@ -463,8 +470,10 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_2D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_2D_EightByteInt = &
@@ -476,7 +485,8 @@ function nf90_get_var_2D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_2D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
 end function nf90_get_var_2D_EightByteInt
@@ -490,14 +500,15 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_3D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(3)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -509,6 +520,7 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_3D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_3D_EightByteInt = &
@@ -520,8 +532,10 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_3D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_3D_EightByteInt = &
@@ -533,7 +547,8 @@ function nf90_get_var_3D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_3D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
 end function nf90_get_var_3D_EightByteInt
@@ -547,14 +562,15 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_4D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(4)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -566,6 +582,7 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_4D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_4D_EightByteInt = &
@@ -577,8 +594,10 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_4D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :, :, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_4D_EightByteInt = &
@@ -590,7 +609,8 @@ function nf90_get_var_4D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_4D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :, :, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :, :, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
 end function nf90_get_var_4D_EightByteInt
@@ -604,14 +624,15 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_5D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(5)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -623,6 +644,7 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_5D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_5D_EightByteInt = &
@@ -634,8 +656,10 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_5D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :, :, :, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_5D_EightByteInt = &
@@ -647,7 +671,8 @@ function nf90_get_var_5D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_5D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :, :, :, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :, :, :, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
 end function nf90_get_var_5D_EightByteInt
@@ -661,14 +686,15 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_6D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(6)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -680,6 +706,7 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_6D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_6D_EightByteInt = &
@@ -691,8 +718,10 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_6D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :, :, :, :, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_6D_EightByteInt = &
@@ -704,7 +733,8 @@ function nf90_get_var_6D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_6D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :, :, :, :, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :, :, :, :, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
 end function nf90_get_var_6D_EightByteInt
@@ -718,14 +748,15 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
   integer                                      :: nf90_get_var_7D_EightByteInt
 
   integer, dimension(nf90_max_var_dims) :: localStart, localCount, localStride, localMap
-  integer                               :: numDims, counter, format_num
-  integer, dimension(size(values))      :: defaultIntArray
-  integer (kind = EightByteInt), dimension(size(values))      :: defaultInt8Array
+  integer                               :: numDims, counter, format_num, shapeValues(7)
+  integer, dimension(:), allocatable    :: defaultIntArray
+  integer (kind = EightByteInt), dimension(:), allocatable :: defaultInt8Array
 
   ! Set local arguments to default values
-  numDims                 = size(shape(values))
+  shapeValues             = shape(values)
+  numDims                 = size(shapeValues)
   localStart (:         ) = 1
-  localCount (:numDims  ) = shape(values)
+  localCount (:numDims  ) = shapeValues
   localCount (numDims+1:) = 1
   localStride(:         ) = 1
   localMap   (:numDims  ) = (/ 1, (product(localCount(:counter)), counter = 1, numDims - 1) /)
@@ -737,6 +768,7 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
   if (nf90_get_var_7D_EightByteInt .eq. nf90_noerr) then
      if (format_num .eq. nf90_format_netcdf4 .OR. &
          format_num .eq. nf90_format_cdf5) then
+        allocate(defaultInt8Array(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_7D_EightByteInt = &
@@ -748,8 +780,10 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_7D_EightByteInt = &
                 nf_get_vara_int64(ncid, varid, localStart, localCount, defaultInt8Array)
         end if
-        values(:, :, :, :, :, :, :) = reshape(defaultInt8Array(:), shape(values))
+        values(:, :, :, :, :, :, :) = reshape(defaultInt8Array(:), shapeValues)
+        if (allocated(defaultInt8Array)) deallocate(defaultInt8Array)
      else
+        allocate(defaultIntArray(size(values)))
         if(present(map))  then
            localMap   (:size(map))    = map(:)
            nf90_get_var_7D_EightByteInt = &
@@ -761,10 +795,11 @@ function nf90_get_var_7D_EightByteInt(ncid, varid, values, start, count, stride,
            nf90_get_var_7D_EightByteInt = &
                 nf_get_vara_int(ncid, varid, localStart, localCount, defaultIntArray)
         end if
-        values(:, :, :, :, :, :, :) = reshape(defaultIntArray(:), shape(values))
+        values(:, :, :, :, :, :, :) = reshape(defaultIntArray(:), shapeValues)
+        if (allocated(defaultIntArray)) deallocate(defaultIntArray)
      end if
   end if
-  
+
 end function nf90_get_var_7D_EightByteInt
 
 

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/netcdf4_func.F90

@@ -183,7 +183,7 @@
     integer, intent(in) :: ncid
     integer, intent(out) :: ndims
     integer, dimension(:), intent(out) :: dimids
-    integer, intent(out) :: include_parents
+    integer, intent(in) :: include_parents
     integer :: nf90_inq_dimids
   
     nf90_inq_dimids = nf_inq_dimids(ncid, ndims, dimids, include_parents)
@@ -255,7 +255,7 @@
     integer, intent(in) :: offset
     integer, intent(in) :: field_typeid
     integer, intent(in) :: ndims
-    integer, intent(in) :: dim_sizes
+    integer, dimension(:), intent(in) :: dim_sizes
     integer :: nf90_insert_array_compound
   
     nf90_insert_array_compound = nf_insert_array_compound(ncid, xtype, name, &
@@ -319,7 +319,7 @@
     integer, intent(out) :: offset
     integer, intent(out) :: field_typeid
     integer, intent(out) :: ndims
-    integer, intent(out) :: dim_sizes
+    integer, dimension(:), intent(out) :: dim_sizes
     integer :: nf90_inq_compound_field
   
     nf90_inq_compound_field = nf_inq_compound_field(ncid, xtype, fieldid, name, offset, &
@@ -380,7 +380,7 @@
     integer, intent(in) :: ncid
     integer, intent(in) :: xtype
     integer, intent(in) :: fieldid
-    integer, intent(out) :: dim_sizes
+    integer, dimension(:), intent(out) :: dim_sizes
     integer :: nf90_inq_cmp_fielddim_sizes
   
     nf90_inq_cmp_fielddim_sizes = nf_inq_compound_fielddim_sizes(ncid, xtype, fieldid, dim_sizes)
@@ -464,20 +464,20 @@
     integer, intent(in) :: xtype
     integer, intent(in) :: idx
     character (len = *), intent(out) :: name
-    integer, intent(in) :: value
+    integer, intent(out) :: value
     integer :: nf90_inq_enum_member
   
     nf90_inq_enum_member = nf_inq_enum_member(ncid, xtype, idx, name, value)
   end function nf90_inq_enum_member
   ! -----------
-  function nf90_inq_enum_ident(ncid, xtype, value, idx)
+  function nf90_inq_enum_ident(ncid, xtype, value, identifier)
     integer, intent(in) :: ncid
     integer, intent(in) :: xtype
     integer, intent(in) :: value
-    integer, intent(out) :: idx
+    character (len = *), intent(out) :: identifier
     integer :: nf90_inq_enum_ident
   
-    nf90_inq_enum_ident = nf_inq_enum_ident(ncid, xtype, value, idx)
+    nf90_inq_enum_ident = nf_inq_enum_ident(ncid, xtype, value, identifier)
   end function nf90_inq_enum_ident
   ! -----------
   function nf90_def_opaque(ncid, size, name, xtype)

{pypartmc-2.0.7 → pypartmc-2.0.8}/gitmodules/netcdf-fortran/fortran/netcdf_attributes.F90

@@ -67,13 +67,53 @@
   end function nf90_put_att_text
   ! -------
   function nf90_get_att_text(ncid, varid, name, values)
+    use, intrinsic :: iso_c_binding, only: c_ptr, c_size_t, c_f_pointer, c_int
+    implicit none
     integer,                          intent( in) :: ncid, varid
     character(len = *),               intent( in) :: name
     character(len = *),               intent(out) :: values
     integer                                       :: nf90_get_att_text
-
-    values = ' '  !! make sure result will be blank padded
-    nf90_get_att_text = nf_get_att_text(ncid, varid, name, values)
+    interface
+      integer(c_int) function nc_get_att_string(ncid, varid, name, pp) bind(c)
+        use iso_c_binding , only : c_int , c_char , c_ptr
+        integer(c_int) , value :: ncid , varid
+        character(kind=c_char) , intent(in) :: name
+        type(c_ptr), intent(out) :: pp
+      end function nc_get_att_string
+    end interface
+    interface
+      integer(c_size_t) function strlen(cs) bind(c, name='strlen')
+         use, intrinsic :: iso_c_binding , only : c_size_t , c_ptr
+         implicit none
+         type(c_ptr), intent(in), value :: cs
+      end function strlen
+    end interface
+    integer :: xtype , nlen , attid , i
+    integer(c_int) :: c_ncid , c_varid , c_status , c_nlen
+    type(c_ptr) :: c_str
+    character(len_trim(name)+1) :: c_aname
+    character , pointer :: f_str(:)
+    nf90_get_att_text = nf90_inquire_attribute(ncid, varid, name, &
+        xtype, nlen, attid)
+    if ( nf90_get_att_text == nf90_noerr ) then
+      if ( xtype == nf90_string .and. nlen == 1 ) then
+        c_ncid = ncid
+        c_varid = varid - 1
+        c_aname = name//char(0)
+        c_status = nc_get_att_string(c_ncid, c_varid, c_aname, c_str)
+        nf90_get_att_text = c_status
+        if ( nf90_get_att_text == nf90_noerr ) then
+          call c_f_pointer(c_str,f_str,[strlen(c_str)])
+          values = adjustl("")
+          do i = 1, size(f_str)
+            values(i:i) = f_str(i)
+          end do
+        end if
+      else
+        values = ' '  !! make sure result will be blank padded
+        nf90_get_att_text = nf_get_att_text(ncid,varid,name,values)
+      end if
+    end if
   end function nf90_get_att_text
   ! -------
   ! Integer attributes
@@ -183,7 +223,7 @@
     character(len = *),                         intent( in) :: name
     integer (kind = FourByteInt), dimension(:), intent(out) :: values
     integer                                                 :: nf90_get_att_FourByteInt
-    
+
     integer, dimension(size(values)) :: defaultInteger
 
     nf90_get_att_FourByteInt = nf_get_att_int(ncid, varid, name, defaultInteger)