[Dart-dev] DART/branches Revision: 11505

[dart at ucar.edu]

nancy at ucar.edu
2017-04-18 14:53:10 -0600 (Tue, 18 Apr 2017)
154
updates to model_mod to match updated interfaces.  not run yet.

updates to path_names to include new modules.
updated quickbuild.
removed wakeup_filter




Modified: DART/branches/model_mod_changes/models/POP/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/POP/model_mod.f90	2017-04-18 16:45:18 UTC (rev 11504)
+++ DART/branches/model_mod_changes/models/POP/model_mod.f90	2017-04-18 20:53:10 UTC (rev 11505)
@@ -16,16 +16,17 @@
                              operator(*),  operator(+), operator(-),           &
                              operator(>),  operator(<), operator(/),           &
                              operator(/=), operator(<=)
-use     location_mod, only : location_type, get_dist, get_close_maxdist_init,  &
-                             get_close_obs_init, set_location,                 &
-                             VERTISHEIGHT, get_location, vert_is_height,       &
-                             vert_is_level, vert_is_surface,                   &
-                             loc_get_close_obs => get_close_obs, get_close_type
+use     location_mod, only : location_type, get_dist, set_location, get_location, &
+                             VERTISHEIGHT, is_vertical, get_close_state,          &
+                             loc_get_close => get_close_obs, get_close_type,  &
+                             convert_vertical_obs, convert_vertical_state
 use    utilities_mod, only : register_module, error_handler,                   &
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,      &
-                             nc_check, do_output, to_upper,                    &
+                             do_output, to_upper,                              &
                              find_namelist_in_file, check_namelist_read,       &
                              file_exist, find_textfile_dims, file_to_text
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_check, &
+                                 nc_add_global_creation_time, nc_redef, nc_enddef
 use     obs_kind_mod, only : QTY_TEMPERATURE, QTY_SALINITY, QTY_DRY_LAND,      &
                              QTY_U_CURRENT_COMPONENT,QTY_V_CURRENT_COMPONENT,  &
                              QTY_SEA_SURFACE_HEIGHT, QTY_SEA_SURFACE_PRESSURE, &
@@ -38,16 +39,14 @@
                              read_horiz_grid, read_topography, read_vert_grid, &
                              get_pop_restart_filename, set_binary_file_conversion, &
                              read_mean_dynamic_topography
-
 use ensemble_manager_mod,  only : ensemble_type, map_pe_to_task, get_copy_owner_index, &
                                   get_var_owner_index
-
 use distributed_state_mod, only : get_state
-
 use state_structure_mod,   only : add_domain, get_model_variable_indices, &
                                   get_num_variables, get_index_start, &
                                   get_num_dims, get_domain_size, &
                                   get_dart_vector_index
+use default_model_mod,     only : adv_1step, init_time, init_conditions, nc_write_model_vars
 
 use typesizes
 use netcdf 
@@ -57,31 +56,33 @@
 
 ! these routines must be public and you cannot change
 ! the arguments - they will be called *from* the DART code.
+
+!> required routines with code in this module
 public :: get_model_size,                &
-          adv_1step,                     &
           get_state_meta_data,           &
           model_interpolate,             &
-          get_model_time_step,           &
+          shortest_time_between_assimilations, &
           static_init_model,             &
           end_model,                     &
-          init_time,                     &
-          init_conditions,               &
+          pert_model_copies,             &
+          get_close_state,               &
           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,               &
           write_model_time
 
+!> required routines where code is in other modules
+public :: adv_1step,                     &
+          init_time,                     &
+          init_conditions,               &
+          get_close_obs,                 &
+          nc_write_model_vars,           &
+          convert_vertical_obs,          &
+          convert_vertical_state
 
+
 ! generally useful routines for various support purposes.
 ! the interfaces here can be changed as appropriate.
 public :: get_gridsize, &
-          restart_file_to_sv, &    !>@ only used by model_mod_check ... not working
           get_pop_restart_filename, &
           test_interpolation
 
@@ -735,49 +736,7 @@
 
 end subroutine update_reg_list
 
-!------------------------------------------------------------
-!> Returns a model state vector, x, that is some sort of appropriate
-!> initial condition for starting up a long integration of the model.
-!> At present, this is only used if the namelist parameter 
-!> start_from_restart is set to .false. in the program perfect_model_obs.