Merge pull request #2 from gold2718/update_externals_to_cesm2_3_alpha02a

Fix for missing no_fill argument
PeterHjortLauritzen · Jan 16, 2021 · ba3c91c · ba3c91c
2 parents 89a7b17 + a864c68
commit ba3c91c
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/utils/cam_pio_utils.F90 b/src/utils/cam_pio_utils.F90
@@ -1215,14 +1215,20 @@ integer function inq_var_fill_i4(File, vdesc, fillvalue, no_fill) result(ierr)
 #endif
      use pio, only: PIO_NOERR
 
+     ! Dummy arguments
      type(File_desc_t),  intent(in)  :: File
      type(var_desc_t),   intent(in)  :: vdesc
      ! fillvalue needs to not be optional to avoid ambiguity
      integer, target,    intent(out) :: fillvalue
      integer, optional,  intent(out) :: no_fill
+     ! Local variable
+     integer :: no_fill_use
 
 #ifdef PIO2
-     ierr = pio_inq_var_fill(File, vdesc, no_fill, fillvalue)
+     ierr = pio_inq_var_fill(File, vdesc, no_fill_use, fillvalue)
+     if (present(no_fill)) then
+        no_fill = no_fill_use
+     end if
 #else
      ierr = PIO_NOERR
      fillvalue = 0
@@ -1236,14 +1242,20 @@ integer function inq_var_fill_r4(File, vdesc, fillvalue, no_fill) result(ierr)
 #endif
      use pio, only: PIO_NOERR
 
+     ! Dummy arguments
      type(File_desc_t),   intent(in)  :: File
      type(var_desc_t),    intent(in)  :: vdesc
      ! fillvalue needs to not be optional to avoid ambiguity
      real(r4), target,    intent(out) :: fillvalue
      integer,  optional,  intent(out) :: no_fill
+     ! Local variable
+     integer :: no_fill_use
 
 #ifdef PIO2
-     ierr = pio_inq_var_fill(File, vdesc, no_fill, fillvalue)
+     ierr = pio_inq_var_fill(File, vdesc, no_fill_use, fillvalue)
+     if (present(no_fill)) then
+        no_fill = no_fill_use
+     end if
 #else
      ierr = PIO_NOERR
      fillvalue = 0.0_R4
@@ -1257,14 +1269,20 @@ integer function inq_var_fill_r8(File, vdesc, fillvalue, no_fill) result(ierr)
 #endif
      use pio, only: PIO_NOERR
 
+     ! Dummy arguments
      type(File_desc_t),   intent(in)  :: File
      type(var_desc_t),    intent(in)  :: vdesc
      ! fillvalue needs to not be optional to avoid ambiguity
      real(r8), target,    intent(out) :: fillvalue
      integer,  optional,  intent(out) :: no_fill
+     ! Local variable
+     integer :: no_fill_use
 
 #ifdef PIO2
-     ierr = pio_inq_var_fill(File, vdesc, no_fill, fillvalue)
+     ierr = pio_inq_var_fill(File, vdesc, no_fill_use, fillvalue)
+     if (present(no_fill)) then
+        no_fill = no_fill_use
+     end if
 #else
      ierr = PIO_NOERR
      fillvalue = 0.0_R8