[Dart-dev] DART/branches Revision: 10743

[dart at ucar.edu]

hendric at ucar.edu
2016-11-11 14:08:40 -0700 (Fri, 11 Nov 2016)
59
This should have gone with the last commit message 10742.




Modified: DART/branches/rma_fixed_filenames/io/state_vector_io_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/state_vector_io_mod.f90	2016-11-11 21:07:49 UTC (rev 10742)
+++ DART/branches/rma_fixed_filenames/io/state_vector_io_mod.f90	2016-11-11 21:08:40 UTC (rev 10743)
@@ -252,11 +252,16 @@
 ! inflation read from netcdf files only for state_space_inflation
 ! Ideally would only do a read transpose for VARYING state_space_inflation
 if ( inflation_handles ) then
-   set_inflation_read(file_info, prior_inflate_handle, PRIOR_INF_COPY, PRIOR_INF_SD_COPY, 'Prior')
-   set_inflation_read(file_info, post_inflate_handle,  POST_INF_COPY,  POST_INF_SD_COPY, 'Posterior')
+   call set_inflation_read(file_info, prior_inflate_handle, PRIOR_INF_COPY, PRIOR_INF_SD_COPY, 'Prior')
+   call set_inflation_read(file_info, post_inflate_handle,  POST_INF_COPY,  POST_INF_SD_COPY, 'Posterior')
 endif
 
-call filter_read_restart_direct(state_ens_handle, file_info, read_time_from_file, time)
+if (get_read_from_single_file(file_info)) then
+   call error_handler(E_MSG,'read_state:', &
+      'JPH : Still need code to write single file restarts')
+else
+   call filter_read_restart_direct(state_ens_handle, file_info, read_time_from_file, time)
+endif
 
 ! Filling copies array for single state space inflation values if required.
 if (inflation_handles) then
@@ -958,12 +963,10 @@
 character(len=*),            intent(in) :: label  
 
 integer :: idom
-character(len=32)  :: label
 character(len=256) :: fname
 
 do idom = 1, get_num_domains()
    if (do_ss_inflate(inflate_handle)) then
-      label = "Prior"
       if (mean_from_restart(inflate_handle)) then
          fname = get_input_file(file_info%restart_files_in, INF_MEAN_COPY, idom)   
          write(msgstring,*) 'mean read from restart file: ' // trim(fname) !input_priorinf_mean[_d0X].nc'