[Dart-dev] DART/branches Revision: 11559

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 17:01:37 -0600 (Thu, 27 Apr 2017)
48
convert to new interfaces, updated quickbuild.




Modified: DART/branches/model_mod_changes/models/mpas_atm/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/mpas_atm/model_mod.f90	2017-04-27 23:00:39 UTC (rev 11558)
+++ DART/branches/model_mod_changes/models/mpas_atm/model_mod.f90	2017-04-27 23:01:37 UTC (rev 11559)
@@ -27,18 +27,23 @@
                              operator(/=), operator(<=)
 
 use     location_mod, only : location_type, get_dist, query_location,          &
-                             get_close_maxdist_init, get_close_type,           &
-                             set_location, get_location, horiz_dist_only,      &
-                             write_location,                                   &
-                             vert_is_undef,        VERTISUNDEF,                &
-                             vert_is_surface,      VERTISSURFACE,              &
-                             vert_is_level,        VERTISLEVEL,                &
-                             vert_is_pressure,     VERTISPRESSURE,             &
-                             vert_is_height,       VERTISHEIGHT,               &
-                             vert_is_scale_height, VERTISSCALEHEIGHT,          &
-                             get_close_obs_init, get_close_obs_destroy,        &
-                             loc_get_close_obs => get_close_obs
+                             get_close_type, set_location, get_location,       &
+                             write_location, vertical_localization_on,         &
+                             VERTISUNDEF, VERTISSURFACE, VERTISLEVEL,          &
+                             VERTISPRESSURE, VERTISHEIGHT, VERTISSCALEHEIGHT,  &
+                             loc_get_close_obs => get_close_obs,               &
+                             loc_get_close_state => get_close_state,           &
+                             is_vertical
                              
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_sync, &
+                                 nc_add_global_creation_time, nc_redef, nc_enddef
+
+use location_io_mod,      only :  nc_write_location_atts, nc_get_location_varids, &
+                                  nc_write_location
+
+use default_model_mod,     only : nc_write_model_vars, init_time, init_conditions, &
+                                  adv_1step
+
 use xyz_location_mod, only : xyz_location_type, xyz_get_close_maxdist_init,    &
                              xyz_get_close_type, xyz_set_location, xyz_get_location, &
                              xyz_get_close_obs_init, xyz_get_close_obs_destroy, &
@@ -110,9 +115,9 @@
 public :: get_model_size,                 &
           get_num_vars,                   &
           adv_1step,                      &
-          get_state_meta_data,    &
-          model_interpolate,      &
-          get_model_time_step,            &
+          get_state_meta_data,            &
+          model_interpolate,              &
+          shortest_time_between_assimilations, &
           static_init_model,              &
           end_model,                      &
           init_time,                      &
@@ -120,12 +125,11 @@
           nc_write_model_atts,            &
           nc_write_model_vars,            &
           pert_model_copies,              &
-          get_close_maxdist_init,         &
-          get_close_obs_init,             &
-          get_close_obs,          &
-          query_vert_localization_coord,  &
-          vert_convert,           &
-          read_model_time,                 &
+          get_close_obs,                  &
+          get_close_state,                &
+          convert_vertical_obs,           &
+          convert_vertical_state,         &
+          read_model_time,                &
           write_model_time
 
 ! generally useful routines for various support purposes.
@@ -815,7 +819,7 @@
 
 !------------------------------------------------------------------
 
-subroutine get_state_meta_data(state_handle, index_in, location, var_type)
+subroutine get_state_meta_data(index_in, location, var_type)
 
 ! given an index into the state vector, return its location and
 ! if given, the var kind.   despite the name, var_type is a generic
@@ -822,7 +826,6 @@
 ! kind, like those in obs_kind/obs_kind_mod.f90, starting with QTY_
 
 ! passed variables
-type(ensemble_type), intent(in)  :: state_handle
 integer(i8),         intent(in)  :: index_in
 type(location_type), intent(out) :: location
 integer, optional,   intent(out) :: var_type
@@ -890,19 +893,23 @@
    endif
 endif
 
-! Let us return the vert location with the requested vertical localization coordinate
-! hoping that the code can run faster when same points are close to many obs
-! since vert_convert does not need to be called repeatedly in get_close_obs any more.
-! FIXME: we should test this to see if it's a win (in computation time).  for obs
-! which are not dense relative to the grid, this might be slower than doing the
+! we are no longer passing in an ensemble handle to this routine, so we
+! cannot do vertical conversion here.  assim_tools will call vertical conversion
+! on the obs and on the state.
+
+!! Let us return the vert location with the requested vertical localization coordinate