[Dart-dev] DART/branches Revision: 11258

[dart at ucar.edu]

hendric at ucar.edu
2017-03-09 09:24:45 -0700 (Thu, 09 Mar 2017)
42
merging in recent changes from rma_trunk




Index: DART/branches/rma_rearrange
===================================================================
--- DART/branches/rma_rearrange	2017-03-09 15:34:47 UTC (rev 11257)
+++ DART/branches/rma_rearrange	2017-03-09 16:24:45 UTC (rev 11258)

Property changes on: DART/branches/rma_rearrange
___________________________________________________________________
Modified: svn:mergeinfo
## -28,6 +28,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
+/DART/branches/rma_trunk:11170-11257
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
## -38,5 +39,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_rearrange/assim_tools
===================================================================
--- DART/branches/rma_rearrange/assim_tools	2017-03-09 15:34:47 UTC (rev 11257)
+++ DART/branches/rma_rearrange/assim_tools	2017-03-09 16:24:45 UTC (rev 11258)

Property changes on: DART/branches/rma_rearrange/assim_tools
___________________________________________________________________
Modified: svn:mergeinfo
## -29,6 +29,7 ##
 /DART/branches/rma_sprint/assim_tools:8101-8172
 /DART/branches/rma_state_structure_test_dir/assim_tools:9478-9682
 /DART/branches/rma_state_structure_unit_test/assim_tools:9697-10274
+/DART/branches/rma_trunk/assim_tools:11170-11257
 /DART/branches/rma_trunk_clamping/assim_tools:8792-8807
 /DART/branches/rma_trunk_filename/assim_tools:8017-8163
 /DART/branches/rma_trunk_get_state_fun/assim_tools:8574-8602
## -39,6 +40,7 ##
 /DART/branches/rma_trunk_posterior/assim_tools:9774-9787
 /DART/branches/rma_trunk_read_transpose/assim_tools:9214-9256
 /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_rearrange/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_rearrange/assim_tools/assim_tools_mod.f90	2017-03-09 15:34:47 UTC (rev 11257)
+++ DART/branches/rma_rearrange/assim_tools/assim_tools_mod.f90	2017-03-09 16:24:45 UTC (rev 11258)
@@ -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