[Dart-dev] DART/branches Revision: 11417

[dart at ucar.edu]

nancy at ucar.edu
2017-03-29 17:58:54 -0600 (Wed, 29 Mar 2017)
235
fix the wrf_dart_obs_preprocess (needed dummy ensemble for
a call to model_interpolate() which didn't depend on having
state, and fixed the path_names_file.  updated quickbuild.csh

replaced calls to vert_is_xxx() with is_vertical() 




Modified: DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/ensemble_init.f90
===================================================================
--- DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/ensemble_init.f90	2017-03-29 23:03:45 UTC (rev 11416)
+++ DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/ensemble_init.f90	2017-03-29 23:58:54 UTC (rev 11417)
@@ -44,8 +44,6 @@
                              wrf_io, wrfbdy_io, &
                              set_wrf_date
 use      location_mod, only : location_type, get_location, set_location, & 
-                              vert_is_surface, vert_is_level, vert_is_pressure, vert_is_height, &
-                              VERTISUNDEF, VERTISSURFACE, VERTISLEVEL, VERTISPRESSURE, &
                               VERTISHEIGHT
 use    utilities_mod, only : get_unit, file_exist, open_file, &
                              close_file, error_handler, E_ERR, E_MSG, initialize_utilities, &

Modified: DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/grid_refl_obs.f90
===================================================================
--- DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/grid_refl_obs.f90	2017-03-29 23:03:45 UTC (rev 11416)
+++ DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/grid_refl_obs.f90	2017-03-29 23:58:54 UTC (rev 11417)
@@ -39,11 +39,7 @@
                              ij_to_latlon, gridwind_to_truewind
 use     location_mod, only : location_type, get_location, set_location_missing, &
                              write_location, operator(/=),     &
-                             vert_is_undef,    VERTISUNDEF,    &
-                             vert_is_surface,  VERTISSURFACE,  &
-                             vert_is_level,    VERTISLEVEL,    &
-                             vert_is_pressure, VERTISPRESSURE, &
-                             vert_is_height,   VERTISHEIGHT
+                             is_vertical
 use time_manager_mod, only : time_type, set_date, set_time, get_time, print_time, &
                              set_calendar_type, print_date, GREGORIAN, &
                              operator(*), operator(+), operator(-), &
@@ -327,7 +323,7 @@
   ob_loc = get_obs_def_location(obs_def)
   obs_kind_ind = get_obs_def_type_of_obs(obs_def)
 
-  if ( (obs_kind_ind == RADAR_REFLECTIVITY) .and. (vert_is_height(ob_loc)) ) then
+  if ( (obs_kind_ind == RADAR_REFLECTIVITY) .and. (is_vertical(ob_loc, "HEIGHT")) ) then
   
     num_refl_obs = num_refl_obs + 1
 

Modified: DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90
===================================================================
--- DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90	2017-03-29 23:03:45 UTC (rev 11416)
+++ DART/branches/model_mod_changes/models/wrf/WRF_DART_utilities/wrf_dart_obs_preprocess.f90	2017-03-29 23:58:54 UTC (rev 11417)
@@ -28,7 +28,7 @@
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-use        types_mod, only : r8
+use        types_mod, only : r8, i8
 use obs_sequence_mod, only : obs_sequence_type, static_init_obs_sequence, &
                              read_obs_seq_header, destroy_obs_sequence, &
                              get_num_obs, write_obs_seq 
@@ -38,6 +38,7 @@
                              METAR_U_10_METER_WIND, GPSRO_REFRACTIVITY, &
                              SAT_U_WIND_COMPONENT, PROFILER_U_WIND_COMPONENT, VORTEX_LAT
 use time_manager_mod, only : time_type, set_calendar_type, GREGORIAN, set_time
+use ensemble_manager_mod, only : ensemble_type, init_ensemble_manager, end_ensemble_manager
 use        model_mod, only : static_init_model
 use           netcdf
 
@@ -121,6 +122,8 @@
 
 type(time_type)         :: anal_time
 
+type(ensemble_type)     :: dummy_ens
+
 print*,'Enter target assimilation time (gregorian day, second): '
 read*,gday,gsec
 call set_calendar_type(GREGORIAN)
@@ -128,6 +131,7 @@
 
 call static_init_obs_sequence()
 call static_init_model()
+call init_ensemble_manager(dummy_ens, 1, 1_i8)
 
 call find_namelist_in_file("input.nml", "wrf_obs_preproc_nml", iunit)
 read(iunit, nml = wrf_obs_preproc_nml, iostat = io)
@@ -293,8 +297,7 @@
 call write_obs_seq(seq_all, file_name_output)
 call destroy_obs_sequence(seq_all)
 
-stop
-end
+contains
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
@@ -343,8 +346,7 @@
 
 use         types_mod, only : r8
 use  time_manager_mod, only : time_type, operator(>=)
-use      location_mod, only : location_type, get_location, vert_is_pressure, &
-                              vert_is_height
+use      location_mod, only : location_type, get_location, is_vertical
 use  obs_sequence_mod, only : obs_sequence_type, obs_type, init_obs, set_obs_def, &
                               get_num_copies, get_num_qc, read_obs_seq, copy_obs, &
                               get_first_obs, get_obs_def, get_next_obs, &
@@ -367,9 +369,7 @@
 real(r8), intent(in)                   :: obs_bdy, ptop, htop, elev_max