[Dart-dev] DART/branches Revision: 11550

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 14:06:13 -0600 (Thu, 27 Apr 2017)
109
update the model_mod, remove output_state_vector from namelist,
update the path_names files and quickbuild.




Modified: DART/branches/model_mod_changes/models/ROMS/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/ROMS/model_mod.f90	2017-04-27 19:23:49 UTC (rev 11549)
+++ DART/branches/model_mod_changes/models/ROMS/model_mod.f90	2017-04-27 20:06:13 UTC (rev 11550)
@@ -42,14 +42,11 @@
                              operator(>),  operator(<), operator(/),            &
                              operator(/=), operator(<=)
 
-use     location_mod, only : location_type, get_dist, get_close_maxdist_init,   &
-                             get_close_obs_init, set_location,                  &
-                             get_location, vert_is_height,write_location,       &
-                             set_location_missing,query_location,               &
-                             vert_is_level, vert_is_surface,                    &
-                             loc_get_close_obs => get_close_obs, get_close_type,&
-                             VERTISHEIGHT,VERTISSURFACE,VERTISUNDEF,VERTISLEVEL,&
-                             VERTISPRESSURE,VERTISSCALEHEIGHT,horiz_dist_only
+use     location_mod, only : location_type, set_location, get_location,         &
+                             write_location, set_location_missing,              &
+                             get_close_obs, get_close_state,                    &
+                             convert_vertical_obs, convert_vertical_state,      &
+                             VERTISHEIGHT, VERTISSURFACE
 
 use    utilities_mod, only : register_module, error_handler, do_nml_term,       &
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,       &
@@ -88,6 +85,15 @@
                                   get_long_name, get_xtype, get_has_missing_value, &
                                   get_dim_lengths
 
+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 : pert_model_copies, nc_write_model_vars, init_conditions, &
+                                  init_time, adv_1step
+
 use typesizes
 use netcdf
 
@@ -100,7 +106,7 @@
           adv_1step,                     &
           get_state_meta_data,           &
           model_interpolate,             &
-          get_model_time_step,           &
+          shortest_time_between_assimilations, &
           static_init_model,             &
           end_model,                     &
           init_time,                     &
@@ -108,13 +114,12 @@
           nc_write_model_atts,           &
           nc_write_model_vars,           &
           pert_model_copies,             &
-          get_close_maxdist_init,        &
-          get_close_obs_init,            &
-          query_vert_localization_coord, &
-          vert_convert,                  &
           write_model_time,              &
           read_model_time,               &
-          get_close_obs
+          convert_vertical_obs,          &
+          convert_vertical_state,        &
+          get_close_obs,                 &
+          get_close_state
 
 public :: get_time_information,          &
           get_location_from_ijk
@@ -137,7 +142,6 @@
 character(len=256) :: roms_filename = 'roms_input.nc'
 
 namelist /model_nml/  &
-   output_state_vector,         &
    assimilation_period_days,    &
    assimilation_period_seconds, &
    roms_filename,               &
@@ -220,40 +224,8 @@
 end function get_model_size
 
 
-!-----------------------------------------------------------------------
-!>
-!> Does a single timestep advance of the model in a subroutine call.
-!> This interface is only called if the namelist parameter
-!> async is set to 0 in perfect_model_obs of filter or if the
-!> program integrate_model is to be used to advance the model
-!> state as a separate executable. If one of these options
-!> is not going to be used (the model will only be advanced as
-!> a separate model-specific executable), this can be a
-!> NULL INTERFACE.
-!>
-!> NOTE: not supported for ROMS. Will intentionally generate a fatal error.
-!>
-!> @param x the model state before and after the model advance.
-!> @param time the desired time at the end of the model advance.
-!>
 
-subroutine adv_1step(x, time)
-
-real(r8),        intent(inout) :: x(:)
-type(time_type), intent(in)    :: time
-