[Dart-dev] DART/branches Revision: 11039

[dart at ucar.edu]

nancy at ucar.edu
2017-02-08 13:08:59 -0700 (Wed, 08 Feb 2017)
67
first pass at making L84 work.  PMO runs, will check
filter next.




Modified: DART/branches/rma_single_file/models/lorenz_84/model_mod.f90
===================================================================
--- DART/branches/rma_single_file/models/lorenz_84/model_mod.f90	2017-02-08 19:54:49 UTC (rev 11038)
+++ DART/branches/rma_single_file/models/lorenz_84/model_mod.f90	2017-02-08 20:08:59 UTC (rev 11039)
@@ -9,16 +9,30 @@
 ! Implements Lorenz 84 3 variable model with intermediate level
 ! attractor.
 
-use        types_mod, only : r8
-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, get_close_obs
+use        types_mod,      only : r8, i8, i4
 
-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
+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         obs_kind_mod,  only : RAW_STATE_VARIABLE
+
+use ensemble_manager_mod,  only : ensemble_type
+
+use distributed_state_mod, only : get_state
+
+use state_structure_mod,   only : add_domain, state_structure_info
+
+use dart_time_io_mod,      only : read_model_time, write_model_time
+
+
 implicit none
 private
 
@@ -33,8 +47,14 @@
           init_conditions, &
           nc_write_model_atts, &
           nc_write_model_vars, &
-          pert_model_state, &
-          get_close_maxdist_init, get_close_obs_init, get_close_obs, ens_mean_for_model
+          pert_model_copies, &
+          get_close_maxdist_init, &
+          get_close_obs_init, &
+          get_close_obs, &
+          vert_convert, &
+          query_vert_localization_coord, &
+          read_model_time, &
+          write_model_time
 
 
 ! version controlled file description for error handling, do not edit
@@ -46,7 +66,7 @@
 !  define model parameters
 
 ! Model size is fixed
-integer, parameter :: model_size = 3
+integer(i8), parameter :: model_size = 3
 
 !-------------------------------------------------------------
 ! Namelist with default values
@@ -79,7 +99,8 @@
 !
 
 real(r8) :: x_loc
-integer  :: i, iunit, io
+integer(i8) :: i
+integer  :: iunit, io, dom_id
 
 ! Print module information to log file and stdout.
 call register_module(source, revision, revdate)
@@ -102,6 +123,10 @@
 ! The time_step in terms of a time type must also be initialized.
 time_step = set_time(time_step_seconds, time_step_days)
 
+! Tell the DART I/O routines how large the model data is so they
+! can read/write it.
+dom_id = add_domain(model_size)
+
 end subroutine static_init_model
 
 
@@ -203,7 +228,7 @@
 !
 ! Returns size of model
 
-integer :: get_model_size
+integer(i8) :: get_model_size
 
 get_model_size = model_size
 
@@ -226,7 +251,8 @@