Skip to content

Commit

Permalink
dmupdate: change type of buffer counter (#1315)
Browse files Browse the repository at this point in the history 
* change counter allocations and add remap_counter fn
  • Loading branch information
@rem1776
rem1776 authored Sep 8, 2023
1 parent 3e4faad commit 39e6cb2
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions diag_manager/fms_diag_output_buffer.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ module fms_diag_output_buffer_mod
class(*), allocatable :: buffer(:,:,:,:,:) !< 5D numeric data array
integer :: ndim !< Number of dimensions for each variable
integer, allocatable :: buffer_dims(:) !< holds the size of each dimension in the buffer
class(*), allocatable :: counter(:,:,:,:,:) !< (x,y,z, time-of-day) used in the time averaging functions
real(r8_kind), allocatable :: counter(:,:,:,:,:) !< (x,y,z, time-of-day) used in the time averaging functions
integer, allocatable :: num_elements(:) !< used in time-averaging
class(*), allocatable :: count_0d(:) !< used in time-averaging along with
real(r8_kind), allocatable :: count_0d(:) !< used in time-averaging along with
!! counter which is stored in the child types (bufferNd)
integer, allocatable :: axis_ids(:) !< Axis ids for the buffer
integer :: field_id !< The id of the field the buffer belongs to
Expand Down Expand Up @@ -152,36 +152,36 @@ subroutine allocate_buffer(this, buff_type, ndim, buff_sizes, field_name, diurna
type is (integer(kind=i4_kind))
allocate(integer(kind=i4_kind) :: this%buffer(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(integer(kind=i4_kind) :: this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
allocate(this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(integer(kind=i4_kind) :: this%count_0d(n_samples))
this%counter = 0_i4_kind
this%count_0d = 0_i4_kind
allocate(this%count_0d(n_samples))
this%counter = 0.0_r4_kind
this%count_0d = 0.0_r4_kind
this%buffer_type = i4
type is (integer(kind=i8_kind))
allocate(integer(kind=i8_kind) :: this%buffer(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(integer(kind=i8_kind) :: this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
allocate(this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(integer(kind=i8_kind) :: this%count_0d(n_samples))
this%counter = 0_i8_kind
this%count_0d = 0_i8_kind
allocate(this%count_0d(n_samples))
this%counter = 0.0_r8_kind
this%count_0d = 0.0_r8_kind
this%buffer_type = i8
type is (real(kind=r4_kind))
allocate(real(kind=r4_kind) :: this%buffer(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(real(kind=r4_kind) :: this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
allocate(this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(real(kind=r4_kind) :: this%count_0d(n_samples))
allocate(this%count_0d(n_samples))
this%counter = 0.0_r4_kind
this%count_0d = 0.0_r4_kind
this%buffer_type = r4
type is (real(kind=r8_kind))
allocate(real(kind=r8_kind) :: this%buffer(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(real(kind=r8_kind) :: this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
allocate(this%counter(buff_sizes(1),buff_sizes(2),buff_sizes(3),buff_sizes(4), &
& buff_sizes(5)))
allocate(real(kind=r8_kind) :: this%count_0d(n_samples))
allocate(this%count_0d(n_samples))
this%counter = 0.0_r8_kind
this%count_0d = 0.0_r8_kind
this%buffer_type = r8
Expand Down

0 comments on commit 39e6cb2

Please sign in to comment.