[Dart-dev] DART/branches Revision: 11740

[dart at ucar.edu]

nancy at ucar.edu
2017-06-15 10:42:32 -0600 (Thu, 15 Jun 2017)
46
update types/kinds -> type of obs/quantities




Modified: DART/branches/coamps/models/coamps_nest/navdas_innov_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/navdas_innov_mod.f90	2017-06-15 16:37:21 UTC (rev 11739)
+++ DART/branches/coamps/models/coamps_nest/navdas_innov_mod.f90	2017-06-15 16:42:32 UTC (rev 11740)
@@ -40,8 +40,8 @@
                               set_obs_def,                                 &
                               set_obs_values
 
-  use obs_kind_mod,    only : get_obs_kind_index,                          &
-                              get_obs_kind_var_type,                       &
+  use obs_kind_mod,    only : get_index_for_type_of_obs,                   &
+                              get_quantity_for_type_of_obs,                &
                               QTY_VORTEX_LAT, QTY_VORTEX_LON
 
   use obs_err_mod,     only : rawin_temp_error,                            &
@@ -387,7 +387,7 @@
       ob_qc  = 0.0_r8
 
       ! Set the vortex lat location
-      call init_obs_def(obs_def, ob_loc, get_obs_kind_index('VORTEX_LAT'),time_ob, ob_err) 
+      call init_obs_def(obs_def, ob_loc, get_index_for_type_of_obs('VORTEX_LAT'),time_ob, ob_err) 
       call set_obs_def(obs, obs_def) 
       call set_obs_values(obs, (/ob_lat/))
       call set_qc(obs, (/ob_qc/))
@@ -395,7 +395,7 @@
       call insert_obs_in_seq(seq, obs)
 
       ! Set the vortex lon location
-      call init_obs_def(obs_def, ob_loc, get_obs_kind_index('VORTEX_LON'),time_ob, ob_err) 
+      call init_obs_def(obs_def, ob_loc, get_index_for_type_of_obs('VORTEX_LON'),time_ob, ob_err) 
       call set_obs_def(obs, obs_def) 
       call set_obs_values(obs, (/ob_lon/))
       call set_qc(obs, (/ob_qc/))
@@ -504,11 +504,11 @@
     if(vert_level == VERTISPRESSURE) ob_lev = ob_lev*CONVERT_MB_TO_PA
 
     ob_loc  = set_location(ob_lon, ob_lat, ob_lev, vert_level)
-    ob_type_indx = get_obs_kind_index(ob_type) 
+    ob_type_indx = get_index_for_type_of_obs(ob_type) 
 
     if(ob_type_indx <= 0) return
 
-    ob_kind_indx=get_obs_kind_var_type(ob_type_indx)
+    ob_kind_indx=get_quantity_for_type_of_obs(ob_type_indx)
 
     call init_obs_def(obs_def, ob_loc, ob_type_indx, time_ob, ob_err) 
     call set_obs_def(obs, obs_def)