Updates CMakeLists.txt, diag_manager/Makefile.am, fms_diag_object.F90…

…, fms_diag_reduction_methods.F90

CMakeLists.txt

@@ -139,6 +139,7 @@ list(APPEND fms_fortran_src_files
   diag_manager/fms_diag_elem_weight_procs.F90
   diag_manager/fms_diag_fieldbuff_update.F90
   diag_manager/fms_diag_bbox.F90
+  diag_manager/fms_diag_reduction_methods.F90
   drifters/cloud_interpolator.F90
   drifters/drifters.F90
   drifters/drifters_comm.F90

diag_manager/Makefile.am

@@ -90,7 +90,8 @@ diag_manager_mod.$(FC_MODEXT): diag_axis_mod.$(FC_MODEXT) diag_data_mod.$(FC_MOD
                                fms_diag_time_reduction_mod.$(FC_MODEXT) fms_diag_outfield_mod.$(FC_MODEXT) \
                                fms_diag_fieldbuff_update_mod.$(FC_MODEXT)
 fms_diag_output_buffer_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT)
-fms_diag_reduction_methods_mod.$(FC_MODEXT): diag_util_mod.$(FC_MODEXT)
+fms_diag_reduction_methods_mod.$(FC_MODEXT): fms_diag_bbox_mod.$(FC_MODEXT) fms_diag_output_buffer_mod.$(FC_MODEXT) \
+                                             diag_data_mod.$(FC_MODEXT)
 
 # Mod files are built and then installed as headers.
 MODFILES = \

diag_manager/fms_diag_object.F90

@@ -530,9 +530,6 @@ logical function fms_diag_accept_data (this, diag_field_id, field_data, time, is
     return
   end if
 
-  !> Allocate buffers of this field variable
-  call allocate_diag_field_output_buffers(field_data, diag_field_id)
-
 !> Does the user want to push off calculations until send_diag_complete?
   buffer_the_data = .false.
 !> initialize the number of threads and level to be 0
@@ -569,7 +566,10 @@ logical function fms_diag_accept_data (this, diag_field_id, field_data, time, is
     fms_diag_accept_data = .TRUE.
     return
   else
-!!TODO: Loop through fields and do averages/math functions
+    !> Allocate buffers of this field variable
+    call allocate_diag_field_output_buffers(field_data, diag_field_id)
+
+    !> Do time reductions (average, min, max, rms error, sum, etc.)
     fms_diag_accept_data = fms_diag_do_reduction(field_data, diag_field_id, oor_mask, weight, &
       time, is_in, js_in, ks_in, ie_in, je_in, ke_in, err_msg)
     call this%FMS_diag_fields(diag_field_id)%set_math_needs_to_be_done(.FALSE.)
@@ -1185,6 +1185,7 @@ function fms_diag_do_reduction(this, field_data, diag_field_id, oor_mask, weight
       reduction_method = this%FMS_diag_fields(diag_field_id)%diag_field(i)%get_var_reduction()
       has_diurnal_axis = this%FMS_diag_fields(diag_field_id)%diag_field(i)%has_n_diurnal()
       field_name = this%FMS_diag_fields(diag_field_id)%diag_field(i)%get_var_fname()
+      reduced_k_range = this%FMS_diag_fields(diag_field_id)%diag_field(i)%has_var_zbounds()
 
       if (this%FMS_diag_fields(diag_field_id)%diag_field(i)%has_pow_value()) THEN
         pow_val = this%FMS_diag_fields(diag_field_id)%diag_field(i)%get_pow_value()
@@ -1215,6 +1216,9 @@ function fms_diag_do_reduction(this, field_data, diag_field_id, oor_mask, weight
             type is (fmsDiagSubAxis_type)
               l_start(j) = ptr_axis%get_starting_index()
               l_end(j) = ptr_axis%get_ending_index()
+            type is (fmsDiagFullAxis_type)
+              l_start(j) = 1
+              l_end(j) = ptr_axis%axis_length()
             class default
               call mpp_error(FATAL, 'fms_diag_object_mod::fms_diag_do_reduction non fmsDiagSubAxis_type axis')
             end select

diag_manager/fms_diag_reduction_methods.F90

@@ -9,7 +9,7 @@ module fms_diag_reduction_methods_mod
   use fms_mod, only: fms_error_handler
   use fms_diag_bbox_mod
   use fms_diag_output_buffer_mod
-  use diag_util_mod, only: debug_diag_manager
+  use diag_data_mod, only: debug_diag_manager
 
   implicit none
   private