moving to use of iosysid

src/flib/ncint_mod.F90

@@ -170,20 +170,22 @@ end function nf_free_decomp
   !! @param compcount The count for the block-cyclic computational
   !! decomposition
   !! @param iodesc @copydoc iodesc_generate
-  !! @author Jim Edwards
+  !! @author Ed Hartnett
   !<
-  function nf_def_decomp(iosystem, basepiotype, dims, compdof, &
+  function nf_def_decomp(iosysid, basepiotype, dims, compdof, &
        decompid, rearr, iostart, iocount) result(status)
-    type (iosystem_desc_t), intent(in) :: iosystem
+    integer(i4), intent(in) :: iosysid
     integer(i4), intent(in) :: basepiotype
     integer(i4), intent(in) :: dims(:)
     integer (PIO_OFFSET_KIND), intent(in) :: compdof(:)
     integer, optional, target :: rearr
     integer (PIO_OFFSET_KIND), optional :: iostart(:), iocount(:)
     integer(i4), intent(inout) :: decompid
     type (io_desc_t) :: iodesc
+    type (iosystem_desc_t) :: iosystem
     integer :: status
 
+    iosystem%iosysid = iosysid
     call PIO_initdecomp(iosystem, basepiotype, dims, compdof, &
          iodesc, rearr, iostart, iocount)
     decompid = iodesc%ioid

tests/fncint/ftst_pio.f90

@@ -15,7 +15,7 @@ program ftst_pio
   parameter (FILE_NAME='ftst_pio.nc')
   integer(kind=PIO_OFFSET_KIND), dimension(3) :: data_buffer, compdof
   integer, dimension(1) :: dims
-  integer :: decompid
+  integer :: decompid, iosysid
   integer :: ierr
 
   ! Set up MPI.
@@ -34,7 +34,7 @@ program ftst_pio
   ! Define a decomposition.
   dims(1) = 3 * ntasks
   compdof = 3 * myRank + (/1, 2, 3/)  ! Where in the global array each task writes
-  ierr = nf_def_decomp(ioSystem, PIO_int, dims, compdof, decompid)
+  ierr = nf_def_decomp(ioSystem%iosysid, PIO_int, dims, compdof, decompid)
 
   ! Create a file.
   ierr = nf_create(FILE_NAME, 64, ncid)