[Dart-dev] DART/branches Revision: 11414

[dart at ucar.edu]

nancy at ucar.edu
2017-03-29 17:02:13 -0600 (Wed, 29 Mar 2017)
40
make it compile.  still needs testing.




Modified: DART/branches/model_mod_changes/models/wrf/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/wrf/model_mod.f90	2017-03-29 23:01:54 UTC (rev 11413)
+++ DART/branches/model_mod_changes/models/wrf/model_mod.f90	2017-03-29 23:02:13 UTC (rev 11414)
@@ -44,15 +44,12 @@
                                 set_date, get_date
 
 use      location_mod,   only : location_type, get_location, set_location, &
-                                horiz_dist_only,                                  &
-                                LocationDims, LocationName, LocationLName, &
-                                query_location, vert_is_undef, vert_is_surface, &
-                                vert_is_level, vert_is_pressure, vert_is_height, &
-                                vert_is_scale_height, VERTISUNDEF, VERTISSURFACE, &
+                                query_location, VERTISUNDEF, VERTISSURFACE, &
                                 VERTISLEVEL, VERTISPRESSURE, VERTISHEIGHT, &
-                                VERTISSCALEHEIGHT, &
-                                get_close_type, get_dist, &
-                                loc_get_close_obs => get_close
+                                VERTISSCALEHEIGHT, vertical_localization_on, &
+                                set_vertical_localization_coord, &
+                                get_close_type, get_dist, is_vertical, &
+                                get_close
 
 use     utilities_mod,  only  : file_exist, open_file, close_file, &
                                 register_module, error_handler, E_ERR, E_WARN, &
@@ -133,7 +130,7 @@
 
 public ::  get_model_size,                &
            get_state_meta_data,           &
-           get_model_time_step,           &
+           shortest_time_between_assimilations, &
            static_init_model,             &
            model_interpolate,             &
            nc_write_model_atts,           &
@@ -140,9 +137,8 @@
            nc_write_model_vars,           &
            get_close_obs,                 &
            get_close_state,               &
-           convert_vert_obs,              &
-           convert_vert_state,            &
-           query_vert_localization_coord, &
+           convert_vertical_obs,          &
+           convert_vertical_state,        &
            pert_model_copies,             &
            read_model_time,               &
            write_model_time
@@ -757,6 +753,9 @@
 write(errstring,*) ' wrf model size is ',wrf%model_size
 call error_handler(E_MSG, 'static_init_model', errstring)
 
+! tell the location module how we want to localize in the vertical
+call set_vertical_localization_coord(vert_localization_coord)
+
 end subroutine static_init_model
 
 !#######################################################################
@@ -827,18 +826,9 @@
 
 !#######################################################################
 
-function get_model_time_step()
-!------------------------------------------------------------------------
-! function get_model_time_step()
-!
-! Returns the time step of the model. In the long run should be replaced
-! by a more general routine that returns details of a general time-stepping
-! capability.
-!
-! toward that end ... we are now reading a namelist variable for the
-! width of the assimilation time window.
+function shortest_time_between_assimilations()
 
-type(time_type) :: get_model_time_step
+type(time_type) :: shortest_time_between_assimilations
 integer :: model_dt, assim_dt
 
 ! We need to coordinate the desired assimilation window to be a 
@@ -849,9 +839,9 @@
 ! The integer arithmetic does its magic.
 assim_dt = (assimilation_period_seconds / model_dt) * model_dt
 
-get_model_time_step = set_time(assim_dt)
+shortest_time_between_assimilations = set_time(assim_dt)
 
-end function get_model_time_step
+end function shortest_time_between_assimilations
 
 
 !#######################################################################
@@ -906,23 +896,23 @@
 !  with task 0 writing the diagnostic files. 
 
 if (.false.) then
-   ! now convert to desired vertical coordinate (defined in the namelist)
-   if (wrf%dom(id)%localization_coord == VERTISLEVEL) then
-      ! here we need level index of mass grid
-      if( (var_type == wrf%dom(id)%type_w ) .or. (var_type == wrf%dom(id)%type_gz) ) then
-         lev = real(kp) - 0.5_r8
-      else
-         lev = real(kp)
-      endif