[Dart-dev] DART/branches Revision: 11556

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 16:09:56 -0600 (Thu, 27 Apr 2017)
36
updated model_mod, and quickbuild.




Modified: DART/branches/model_mod_changes/models/cice/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/cice/model_mod.f90	2017-04-27 21:42:21 UTC (rev 11555)
+++ DART/branches/model_mod_changes/models/cice/model_mod.f90	2017-04-27 22:09:56 UTC (rev 11556)
@@ -23,15 +23,25 @@
 ! location_mod is at rma-cice/location/xxx/location_mod.f90
 ! with the specific subdir set in path_names_xxx
 ! in our case, threed_sphere is the most appropriate choice
-use          location_mod, only : location_type, get_dist, get_close_maxdist_init,  &
-                                  get_close_obs_init, set_location, get_location,   &
-                                  loc_get_close_obs => get_close_obs, get_close_type, &
-                                  vert_is_undef,    VERTISUNDEF,                    &
-                                  vert_is_level,    VERTISLEVEL  ! treat cat as vert level
+use          location_mod, only : location_type, get_dist, get_close_type,      &
+                                  set_location, get_location,                   &
+                                  loc_get_close_obs => get_close_obs,           &
+                                  loc_get_close_state => get_close_state,       &
+                                  convert_vertical_obs, convert_vertical_state, &
+                                  VERTISLEVEL  ! treat cat as vert level
 
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_sync, nc_check, &
+                                 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 : init_time, init_conditions, adv_1step, &
+                                  nc_write_model_vars
+
 use         utilities_mod, only : register_module, error_handler,               &
-                                  E_ERR, E_WARN, E_MSG, nmlfileunit, get_unit,  &
-                                  nc_check, do_output, to_upper, logfileunit,   &
+                                  E_ERR, E_MSG, nmlfileunit, get_unit,  &
+                                  do_output, to_upper, logfileunit,   &
                                   find_namelist_in_file, check_namelist_read,   &
                                   file_exist, find_textfile_dims, file_to_text, &
                                   do_nml_file, do_nml_term
@@ -97,15 +107,12 @@
 use  ensemble_manager_mod, only : ensemble_type, map_pe_to_task, get_copy_owner_index, &
                                   get_var_owner_index
 
-! ../../distributed/distributed_state_mod.f90
 use distributed_state_mod, only : get_state
 
-! ../../io/state_structure_mod.f90
 use   state_structure_mod, only : add_domain, get_model_variable_indices, &
                                   get_num_variables, get_index_start, &
                                   get_num_dims, get_domain_size, state_structure_info
 
-! ../../io/dart_time_io_mod
 use      dart_time_io_mod, only : write_model_time
 
 use typesizes
@@ -120,7 +127,7 @@
           adv_1step,                     &
           get_state_meta_data,           &
           model_interpolate,             &
-          get_model_time_step,           &
+          shortest_time_between_assimilations, &
           static_init_model,             &
           end_model,                     &
           init_time,                     &
@@ -128,11 +135,10 @@
           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,                  &
+          get_close_state,               &
+          convert_vertical_obs,          &
+          convert_vertical_state,        &
           read_model_time,               &
           write_model_time
 
@@ -139,8 +145,7 @@
 ! generally useful routines for various support purposes.
 ! the interfaces here can be changed as appropriate.
 ! FIXME: we should no longer need restart_file_to_sv and sv_to_restart_file
-public :: get_gridsize, restart_file_to_sv, sv_to_restart_file, &
-          get_cice_restart_filename, test_interpolation
+public :: get_cice_restart_filename, test_interpolation
 
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
@@ -263,19 +268,6 @@
 integer(i8) :: model_size    ! the state vector length
 
 
-! FIXME: i would like to remove these routines.  we can reshape 
-! arrays with the reshape() fortran intrinsic if needed in this code.  
-! (but i cannot see where it will be needed anymore.)
-! if we are reading/writing a netcdf variable we can give counts 
-! along with a 1d array source and the netcdf libraries will reshape 
-! the array as it writes without needing to allocate, iterate, deallocate.
-! this is good:  faster, and less code to maintain.
-INTERFACE vector_to_prog_var
-      MODULE PROCEDURE vector_to_2d_prog_var
-      MODULE PROCEDURE vector_to_3d_prog_var