[Dart-dev] DART/branches Revision: 11225

[dart at ucar.edu]

nancy at ucar.edu
2017-03-07 11:51:26 -0700 (Tue, 07 Mar 2017)
347
first pass at replacing kind with quantity and type
with type_of_obs.  this commit addresses the subroutine
calls, the use statements, KIND_ in input.nmls, obs_def_xxx_mod.f90,
and html pages.  all files build with test_dart.csh.

it does not try to change local variable names, nor arguments
to the function calls, nor discussion in html pages.




Modified: DART/branches/rma_types_kinds/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_types_kinds/assim_tools/assim_tools_mod.f90	2017-03-07 18:46:53 UTC (rev 11224)
+++ DART/branches/rma_types_kinds/assim_tools/assim_tools_mod.f90	2017-03-07 18:51:26 UTC (rev 11225)
@@ -24,10 +24,10 @@
                                  destroy_obs
    
 use          obs_def_mod, only : obs_def_type, get_obs_def_location, get_obs_def_time,    &
-                                 get_obs_def_error_variance, get_obs_kind
+                                 get_obs_def_error_variance, get_obs_def_type_of_obs
 
-use         obs_kind_mod, only : get_num_obs_kinds, get_obs_kind_index,                   &
-                                 get_obs_kind_var_type, assimilate_this_obs_kind
+use         obs_kind_mod, only : get_num_types_of_obs, get_index_for_type_of_obs,                   &
+                                 get_quantity_for_type_of_obs, assimilate_this_type_of_obs
 
 use       cov_cutoff_mod, only : comp_cov_factor
 
@@ -211,7 +211,7 @@
 ! myself several times -- we define generic kinds starting at 0, but
 ! the specific types are autogenerated and always start at 1.  so the
 ! cutoff list is never (0:num_types); it is always (num_types).
-num_types = get_num_obs_kinds()
+num_types = get_num_types_of_obs()
 allocate(cutoff_list(num_types)) 
 cutoff_list(:) = cutoff
 has_special_cutoffs = .false.
@@ -236,7 +236,7 @@
 if (num_special_cutoff > 0) has_special_cutoffs = .true.
 
 do i = 1, num_special_cutoff
-   type_index = get_obs_kind_index(special_localization_obs_types(i))
+   type_index = get_index_for_type_of_obs(special_localization_obs_types(i))
    if (type_index < 0) then
       write(msgstring, *) 'unrecognized TYPE_ in the special localization namelist:'
       call error_handler(E_ERR,'assim_tools_init:', msgstring, source, revision, revdate, &
@@ -566,9 +566,9 @@
    call get_obs_def(observation, obs_def)
    base_obs_loc = get_obs_def_location(obs_def)
    obs_err_var = get_obs_def_error_variance(obs_def)
-   base_obs_type = get_obs_kind(obs_def)
+   base_obs_type = get_obs_def_type_of_obs(obs_def)
    if (base_obs_type > 0) then
-      base_obs_kind = get_obs_kind_var_type(base_obs_type)
+      base_obs_kind = get_quantity_for_type_of_obs(base_obs_type)
    else
       call get_state_meta_data(ens_handle, -1 * int(base_obs_type,i8), dummyloc, base_obs_kind)  ! identity obs
    endif
@@ -2670,7 +2670,7 @@
    thistype = my_types(index_list(k))
    if (thistype < 0) then
       local_count = local_count + 1
-   else if (assimilate_this_obs_kind(thistype)) then
+   else if (assimilate_this_type_of_obs(thistype)) then
       local_count = local_count + 1
    endif
 end do
@@ -2704,9 +2704,9 @@
    call get_obs_from_key(obs_seq, this_obs_key, observation)
    call get_obs_def(observation, obs_def)
    my_obs_loc(i)  = get_obs_def_location(obs_def)
-   my_obs_type(i) = get_obs_kind(obs_def)
+   my_obs_type(i) = get_obs_def_type_of_obs(obs_def)
    if (my_obs_type(i) > 0) then
-         my_obs_kind(i) = get_obs_kind_var_type(my_obs_type(i))
+         my_obs_kind(i) = get_quantity_for_type_of_obs(my_obs_type(i))
    else
       !call get_state_meta_data(ens_handle, win, -1 * my_obs_type(i), dummyloc, my_obs_kind(i))    ! identity obs
       ! This is just to get the kind.  WRF needs state_ensemble_handle because it converts the state

Modified: DART/branches/rma_types_kinds/diagnostics/oned/obs_diag.f90
===================================================================
--- DART/branches/rma_types_kinds/diagnostics/oned/obs_diag.f90	2017-03-07 18:46:53 UTC (rev 11224)
+++ DART/branches/rma_types_kinds/diagnostics/oned/obs_diag.f90	2017-03-07 18:51:26 UTC (rev 11225)
@@ -26,8 +26,8 @@
                              get_qc, destroy_obs_sequence, get_last_obs, get_num_qc, &
                              read_obs_seq_header, destroy_obs, get_qc_meta_data
 use      obs_def_mod, only : obs_def_type, get_obs_def_error_variance, get_obs_def_time, &
-                             get_obs_def_location, get_obs_kind
-use     obs_kind_mod, only : max_obs_kinds, get_obs_kind_name
+                             get_obs_def_location, get_obs_def_type_of_obs
+use     obs_kind_mod, only : max_defined_types_of_obs, get_name_for_type_of_obs
 use     location_mod, only : location_type, get_location, operator(/=), LocationDims
 use time_manager_mod, only : time_type, set_time, get_time, print_time, &
                              print_date, set_calendar_type, get_date, &
@@ -256,10 +256,10 @@
 call register_module(source,revision,revdate)
 call static_init_obs_sequence()
 
-num_obs_types = max_obs_kinds ! for compatibility with 3D version
+num_obs_types = max_defined_types_of_obs ! for compatibility with 3D version
 allocate(obs_type_strings(num_obs_types))
-do ivar = 1,max_obs_kinds
-   obs_type_strings(ivar) = get_obs_kind_name(ivar)
+do ivar = 1,max_defined_types_of_obs
+   obs_type_strings(ivar) = get_name_for_type_of_obs(ivar)
 enddo
 
 !----------------------------------------------------------------------
@@ -542,7 +542,7 @@
          call get_obs_from_key(seq, keys(obsindex), observation)