Merge branch 'master' into ejh_err

rfiorella · Jun 26, 2019 · 4b766be · 4b766be
2 parents b059b6d + ab6c5fe
commit 4b766be
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/src/flib/pio_support.F90 b/src/flib/pio_support.F90
@@ -35,7 +35,7 @@ subroutine replace_c_null(istr, ilen)
     integer(kind=pio_offset_kind), optional, intent(in) :: ilen
     integer :: i, slen
     if(present(ilen)) then
-       slen = ilen
+       slen = int(ilen)
     else
        slen = len(istr)
     endif

diff --git a/src/flib/pionfput_mod.F90.in b/src/flib/pionfput_mod.F90.in
@@ -344,6 +344,7 @@ contains
   end function put_var_0d_{TYPE}
 
 
+! TYPE int,real,double
   integer function put_vara_internal_{TYPE} (ncid,varid,start,count, ival) result(ierr)
     integer, intent(in) :: ncid
     integer, intent(in) :: varid
@@ -451,7 +452,19 @@ contains
     character(C_CHAR), intent(out) :: cstr(:)
     integer :: clen, sd({DIMS})
     integer :: cinc
-    integer :: i, j, k, m, n, q
+    integer :: i, j
+#if {DIMS} >= 2
+    integer :: k
+#endif
+#if {DIMS} >= 3
+    integer :: m
+#endif
+#if {DIMS} >= 4
+    integer :: n
+#endif
+#if {DIMS} == 5
+    integer :: q
+#endif
 
     cstr = C_NULL_CHAR
     do i=1,{DIMS}

diff --git a/tests/general/ncdf_get_put.F90.in b/tests/general/ncdf_get_put.F90.in
@@ -251,7 +251,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_put_get_1dvar_slice
   Implicit none
   type(file_desc_t) :: pio_file
   character(len=PIO_TF_MAX_STR_LEN) :: filename
-  type(var_desc_t)  :: pio_var, pio_cvar
+  type(var_desc_t)  :: pio_var
   integer :: pio_dim
   integer, parameter :: MAX_ROW_DIM_LEN = 100
   PIO_TF_FC_DATA_TYPE, dimension(MAX_ROW_DIM_LEN) :: gval, exp_val
@@ -315,7 +315,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_put_get_1dvar_4parts
   Implicit none
   type(file_desc_t) :: pio_file
   character(len=PIO_TF_MAX_STR_LEN) :: filename
-  type(var_desc_t)  :: pio_var, pio_cvar
+  type(var_desc_t)  :: pio_var
   integer :: pio_dim
   integer, parameter :: DIM_LEN = 16
   integer, parameter :: PART_LEN = DIM_LEN / 4
@@ -420,7 +420,7 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_put_get_md2mdplus1_var
   integer, dimension(:), allocatable :: iotypes
   character(len=PIO_TF_MAX_STR_LEN), dimension(:), allocatable :: iotype_descs
   integer :: num_iotypes
-  integer :: i, k, l, m, n, tstep, ret
+  integer :: i, k, l, m, tstep, ret
 
   num_iotypes = 0
   call PIO_TF_Get_nc_iotypes(iotypes, iotype_descs, num_iotypes)

diff --git a/tests/general/ncdf_inq.F90.in b/tests/general/ncdf_inq.F90.in
@@ -75,7 +75,6 @@ SUBROUTINE test_inq_var(pio_file, ret)
   type(file_desc_t), intent(in) :: pio_file
   integer, intent(inout) :: ret
 
-  type(var_desc_t)  :: pio_var
   integer :: var_id, var_type, var_ndims, var_natts
   integer, dimension(:), allocatable :: var_dims
   character(len=pio_max_name) :: var_name

diff --git a/tests/general/pio_rearr.F90.in b/tests/general/pio_rearr.F90.in
@@ -189,7 +189,6 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_rearrs_combs
   character(len=PIO_TF_MAX_STR_LEN), parameter :: attname = "filename"
   character(len=PIO_TF_MAX_STR_LEN), parameter :: dimname = "filename_dim"
   integer, parameter :: NUM_REARRANGERS = 2
-  integer :: rearrs(NUM_REARRANGERS) = (/pio_rearr_subset,pio_rearr_box/)
   integer, parameter :: MAX_PERMS = 4
   integer :: rearrs_perms(NUM_REARRANGERS,MAX_PERMS) = reshape(&
                 (/pio_rearr_subset, pio_rearr_box,&
@@ -206,7 +205,6 @@ PIO_TF_AUTO_TEST_SUB_BEGIN test_rearrs_combs
               "PIO_REARR_BOX   ", "PIO_REARR_BOX   "/),&
               (/NUM_REARRANGERS,MAX_PERMS/)&
             )
-  character(len=PIO_TF_MAX_STR_LEN) :: rearrs_info(NUM_REARRANGERS) = (/"PIO_REARR_SUBSET","PIO_REARR_BOX   "/)
   integer, dimension(:), allocatable :: iotypes
   character(len=PIO_TF_MAX_STR_LEN), dimension(:), allocatable :: iotype_descs
   integer :: i, j, k, num_iotypes = 0

diff --git a/tests/general/util/pio_tutil.F90 b/tests/general/util/pio_tutil.F90
@@ -592,7 +592,6 @@ LOGICAL FUNCTION PIO_TF_Check_int_arr_arr_(arr, exp_arr, arr_shape)
     INTEGER :: nequal_idx
     ! Local and global equal bools
     LOGICAL :: lequal, gequal
-    LOGICAL :: failed
     TYPE failed_info
       SEQUENCE
       INTEGER :: idx
@@ -724,7 +723,6 @@ LOGICAL FUNCTION PIO_TF_Check_real_arr_arr_tol_(arr, exp_arr, arr_shape, tol)
     REAL(KIND=fc_real) :: nequal_idx
     ! Local and global equal bools
     LOGICAL :: lequal, gequal
-    LOGICAL :: failed
     TYPE failed_info
       SEQUENCE
       REAL(KIND=fc_real) :: idx
@@ -857,7 +855,6 @@ LOGICAL FUNCTION PIO_TF_Check_double_arr_arr_tol_(arr, exp_arr, arr_shape, tol)
     REAL(KIND=fc_double) :: nequal_idx
     ! Local and global equal bools
     LOGICAL :: lequal, gequal
-    LOGICAL :: failed
     TYPE failed_info
       SEQUENCE
       REAL(KIND=fc_double) :: idx