[Dart-dev] DART/branches Revision: 11243

[dart at ucar.edu]

nancy at ucar.edu
2017-03-08 14:35:09 -0700 (Wed, 08 Mar 2017)
432
massive renaming of 'kind' to 'quantity', 
and 'types' to 'type_of_obs'.  this commit
takes care of subroutine names and fortran
constants, and the api documents in the html
files.  subsequent commits will take care 
of argument names, preprocessor lines, and
text that talks about kinds and types.

i did run 'test_dart.csh' and everything at least
compiled and perfect_model did run.  apologies
in advance if i've broken things.




Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2017-03-08 21:01:47 UTC (rev 11242)
+++ DART/branches/rma_trunk	2017-03-08 21:35:09 UTC (rev 11243)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -38,5 +38,6 ##
 /DART/branches/rma_trunk_posterior:9774-9787
 /DART/branches/rma_trunk_read_transpose:9214-9256
 /DART/branches/rma_trunk_vert_loc:8538-8543
+/DART/branches/rma_types_kinds:11208-11242
 /DART/branches/trunk_with_cam_style:9473-9540
 /DART/trunk:6306-9556
\ No newline at end of property
Index: DART/branches/rma_trunk/assim_tools
===================================================================
--- DART/branches/rma_trunk/assim_tools	2017-03-08 21:01:47 UTC (rev 11242)
+++ DART/branches/rma_trunk/assim_tools	2017-03-08 21:35:09 UTC (rev 11243)

Property changes on: DART/branches/rma_trunk/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
## -30,6 +30,7 ##
 /DART/branches/rma_trunk_mpi_get_in_utils/assim_tools:8567-8823
 /DART/branches/rma_trunk_pathnames/assim_tools:8021-8034
 /DART/branches/rma_trunk_vert_loc/assim_tools:8538-8543
+/DART/branches/rma_types_kinds/assim_tools:11208-11242
 /DART/branches/trunk_with_cam_style/assim_tools:9473-9540
 /DART/releases/Kodiak/assim_tools:5292-5577
 /DART/trunk/assim_tools:6306-9556
\ No newline at end of property
Modified: DART/branches/rma_trunk/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_trunk/assim_tools/assim_tools_mod.f90	2017-03-08 21:01:47 UTC (rev 11242)
+++ DART/branches/rma_trunk/assim_tools/assim_tools_mod.f90	2017-03-08 21:35:09 UTC (rev 11243)
@@ -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