[Dart-dev] DART/branches Revision: 11547

[dart at ucar.edu]

nancy at ucar.edu
2017-04-27 12:58:10 -0600 (Thu, 27 Apr 2017)
49
converted to new interfaces, updated quickbuild




Modified: DART/branches/model_mod_changes/models/lorenz_84/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/lorenz_84/model_mod.f90	2017-04-27 18:57:13 UTC (rev 11546)
+++ DART/branches/model_mod_changes/models/lorenz_84/model_mod.f90	2017-04-27 18:58:10 UTC (rev 11547)
@@ -13,15 +13,22 @@
 
 use time_manager_mod,      only : time_type, set_time
 
-use     location_mod,      only : location_type, set_location, get_location, &
-                                  LocationDims, LocationName, LocationLName, &
-                                  get_close_maxdist_init, get_close_obs_init, &
-                                  loc_get_close_obs => get_close_obs, get_close_type
-
 use    utilities_mod,      only : register_module, error_handler, E_ERR, E_MSG, nmlfileunit, &
                                   do_output, find_namelist_in_file, check_namelist_read,     &
                                   do_nml_file, do_nml_term, nc_check
 
+use     location_mod,      only : location_type, set_location, get_location, &
+                                  get_close_obs, get_close_state, &
+                                  convert_vertical_obs, convert_vertical_state
+
+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 : end_model, pert_model_copies, nc_write_model_vars
+
 use         obs_kind_mod,  only : RAW_STATE_VARIABLE
 
 use ensemble_manager_mod,  only : ensemble_type
@@ -36,27 +43,31 @@
 implicit none
 private
 
+! these routines must be public and you cannot change the
+! arguments because they will be called *from* other DART code.
+
+!> required routines with code in this module
 public :: get_model_size, &
-          adv_1step, &
-          get_state_meta_data, &
+          get_state_meta_data,  &
           model_interpolate, &
-          get_model_time_step, &
-          end_model, &
+          shortest_time_between_assimilations, &
           static_init_model, &
+          init_conditions,    &
           init_time, &
-          init_conditions, &
-          nc_write_model_atts, &
+          adv_1step, &
+          nc_write_model_atts
+
+!> required routines where code is in other modules
+public :: pert_model_copies, &
           nc_write_model_vars, &
-          pert_model_copies, &
-          get_close_maxdist_init, &
-          get_close_obs_init, &
           get_close_obs, &
-          vert_convert, &
-          query_vert_localization_coord, &
+          get_close_state, &
+          end_model, &
+          convert_vertical_obs, &
+          convert_vertical_state, &
           read_model_time, &
           write_model_time
 
-
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
    "$URL$"
@@ -68,9 +79,8 @@
 ! Model size is fixed
 integer(i8), parameter :: model_size = 3
 
-!-------------------------------------------------------------
 ! Namelist with default values
-!
+
 real(r8) ::      a = 0.25_r8
 real(r8) ::      b = 4.00_r8
 real(r8) ::      f = 8.00_r8 
@@ -80,7 +90,6 @@
 integer  :: time_step_seconds = 3600
 
 namelist /model_nml/ a, b, f, g, deltat, time_step_days, time_step_seconds
-!---------------------------------------------------------------
 
 ! Define the location of the state variables in module storage
 type(location_type) :: state_loc(model_size)
@@ -89,14 +98,11 @@
 
 contains
 
-!==================================================================