[Dart-dev] DART/branches Revision: 12590

[dart at ucar.edu]

hendric at ucar.edu
2018-05-18 17:07:38 -0600 (Fri, 18 May 2018)
151

Removing unused variables and comments.  Looping over
my_num_vars to calculate a mask for observed quantites
to diff.  Renaming kinds to quantities.




Modified: DART/branches/rma_closest_member_tool/assimilation_code/programs/closest_member_tool/closest_member_tool.f90
===================================================================
--- DART/branches/rma_closest_member_tool/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2018-05-18 16:53:29 UTC (rev 12589)
+++ DART/branches/rma_closest_member_tool/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2018-05-18 23:07:38 UTC (rev 12590)
@@ -52,7 +52,8 @@
                                  send_sum_to
 
 use ensemble_manager_mod, only : ensemble_type, init_ensemble_manager, compute_copy_mean, &
-                                 get_var_owner_index
+                                 get_my_vars, get_my_num_vars
+
 !>@todo needs to destroy ensemble before the end of the program
 
 implicit none
@@ -63,18 +64,17 @@
 character(len=32 ), parameter :: revision = "$Revision$"
 character(len=128), parameter :: revdate  = "$Date$"
 
-integer               :: iunit, io, ens, i, j, kindindex
+integer               :: iunit, io, ens, i, j, qtyindex
 integer(i8)           :: ii, model_size
 integer, allocatable  :: index_list(:)
-character(len = 128)  :: ifile, msgstring, msgstring1
-real(r8), allocatable :: mean(:), member(:), diffs(:)
-logical               :: allkinds, done
-logical, allocatable  :: usekind(:), useindex(:)
+character(len = 128)  :: msgstring, msgstring1
+logical               :: allqtys, done
+logical, allocatable  :: useqty(:), useindex(:)
 type(location_type)   :: loc
-integer               :: num_kinds, stype
-type(time_type)       :: mean_time, member_time, mean_advance_time, advance_time
+integer               :: num_qtys, stype
+type(time_type)       :: mean_time, member_time
 integer, parameter    :: max_list_len = 500
-type(file_info_type)  :: ens_file_info, mean_file_info
+type(file_info_type)  :: ens_file_info
 
 
 character(len=64)     :: method_name(4) = (/     &
@@ -112,22 +112,18 @@
    single_restart_file_in,       &
    difference_method,            &
    use_only_qtys         
-type(ensemble_type)             :: ens_handle, mean_ens_handle
+type(ensemble_type)             :: ens_handle
 character(len=256), allocatable :: file_array_input(:,:)
 character(len=256)              :: input_state_files(MAX_FILES) = '' 
 integer                         :: num_domains, idom, imem
-type(time_type)                 :: model_time
-logical                         :: read_time_from_file = .true.
 type(stage_metadata_type)       :: input_restart_files
-character(len=256)              :: string1, my_base, my_desc
+character(len=256)              :: my_base, my_desc
 integer                         :: ENS_MEAN_COPY 
 
-real(r8), allocatable :: adiff(:), local_diffs(:), total_diff(:)
-integer  :: copies, vars, owner, owners_index, addend
-
-!> @todo seems like you are using get_state_meta_data just so you can get the kinds.
-!> WRF and MPAS will be doing the vertical conversion also.
-
+real(r8),    allocatable :: adiff(:), local_diffs(:), total_diff(:)
+integer(i8), allocatable :: vars_array(:)
+integer(i8) :: owners_index
+integer     :: copies, my_num_vars
 !----------------------------------------------------------------
 ! program start
 !----------------------------------------------------------------
@@ -160,13 +156,8 @@
 ! make space for the mean and a single member, plus place to sort list 
 ! for output
 call init_ensemble_manager(ens_handle,      ens_size+1, model_size)
-call init_ensemble_manager(mean_ens_handle, 1,        model_size)
 
-mean_time         = set_time_missing()
-member_time       = set_time_missing()
-mean_advance_time = set_time_missing()
-mean_advance_time = set_time_missing()
-
+member_time = set_time_missing()
 num_domains = get_num_domains()
 
 ! Given either a vector of in/output_state_files or a text file containing
@@ -189,7 +180,6 @@
 endif
 ! read in the ensemble and the mean - always in a separate file
 call io_filenames_init(ens_file_info, ens_size, .false., .false., restart_files=file_array_input)
-call io_filenames_init(mean_file_info, 1,       .false., .false., root_name='input')
 
 do imem = 1, ens_size
    write(my_base,'(A,I0.2)') 'inens_',                 imem
@@ -207,49 +197,44 @@
 
 input_restart_files = get_stage_metadata(ens_file_info)
 
-do idom = 1, num_domains
-   do imem = 1, ens_size
-      write(string1, *) '- Reading File : ', trim(get_restart_filename(input_restart_files, imem, domain=idom))
-   enddo
-enddo