[Dart-dev] DART/branches Revision: 11033

[dart at ucar.edu]

hendric at ucar.edu
2017-02-08 12:09:07 -0700 (Wed, 08 Feb 2017)
106
Making 9var rma compatable.  Compiles and runs with workshop_setup.csh 
but has not been bitwise tested.




Modified: DART/branches/rma_single_file/models/9var/model_mod.f90
===================================================================
--- DART/branches/rma_single_file/models/9var/model_mod.f90	2017-02-08 18:37:11 UTC (rev 11032)
+++ DART/branches/rma_single_file/models/9var/model_mod.f90	2017-02-08 19:09:07 UTC (rev 11033)
@@ -6,15 +6,26 @@
 
 module model_mod
 
-use        types_mod, only : r8
-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, do_output, &
-                             nmlfileunit, find_namelist_in_file, check_namelist_read, &
-                             do_nml_file, do_nml_term
+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, do_output, &
+                                  nmlfileunit, find_namelist_in_file, check_namelist_read, &
+                                  do_nml_file, do_nml_term
+
+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
+
+
 ! All random_seq_mod calls were suppressed because a) they are not being used,
 ! and b) they make the pg5.02 compiler complain about a gap in the common block.
 ! TJH 29 April 2004
@@ -36,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
 character(len=256), parameter :: source   = &
@@ -45,7 +62,7 @@
 character(len=32 ), parameter :: revision = "$Revision$"
 character(len=128), parameter :: revdate  = "$Date$"
 
-integer, parameter :: model_size = 9
+integer(i8), parameter :: model_size = 9
 
 !  define model parameters
 ! c is sqrt(0.75)
@@ -100,7 +117,7 @@
 
 implicit none
 real(r8) :: x_loc
-integer :: i, iunit, io
+integer :: i, iunit, io, dom_id
 
 ! Register the module into the logfile
 call register_module(source, revision, revdate)
@@ -125,6 +142,13 @@
 ! Shree Khare.
 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)
+
+call state_structure_info(dom_id)
+
+
 end subroutine static_init_model
 
 
@@ -479,7 +503,7 @@
 
 
 
-subroutine model_interpolate(x, location, itype, obs_val, istatus)
+subroutine model_interpolate(state_handle, ens_size, location, itype, expected_obs, istatus)
 !---------------------------------------------------------------------
 !
 ! Interpolates from state vector x to the location. It's not particularly
@@ -493,17 +517,18 @@
 
 implicit none
 
-real(r8),            intent(in) :: x(:)