[Dart-dev] DART/branches Revision: 10943

[dart at ucar.edu]

hendric at ucar.edu
2017-01-24 14:53:23 -0700 (Tue, 24 Jan 2017)
29
removing unneeded comments.




Modified: DART/branches/rma_single_file/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_single_file/filter/filter_mod.f90	2017-01-24 21:49:16 UTC (rev 10942)
+++ DART/branches/rma_single_file/filter/filter_mod.f90	2017-01-24 21:53:23 UTC (rev 10943)
@@ -694,7 +694,6 @@
    if ((output_interval > 0) .and. &
        (time_step_number / output_interval * output_interval == time_step_number)) then
 
-
       if (get_stage_to_write('preassim')) then
          if (single_file_out) then
             call write_single_file(curr_ens_time, &
@@ -921,8 +920,8 @@
    call end_ensemble_manager(qc_ens_handle)
 
    call trace_message('Bottom of main advance time loop')
-   ! if ((output_interval > 0) .and. &
-   !     (time_step_number / output_interval * output_interval == time_step_number)) then
+   if ((output_interval > 0) .and. &
+       (time_step_number / output_interval * output_interval == time_step_number)) then
       if (single_file_out) then
          call write_single_file(curr_ens_time, &
                OutputStateUnit, state_ens_handle, &
@@ -932,7 +931,7 @@
                prior_inflate, PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
                post_inflate, POST_INF_COPY, POST_INF_SD_COPY)
       endif
-   ! endif
+   endif
 end do AdvanceTime
 
 !call test_state_copies(state_ens_handle, 'last')
@@ -1046,26 +1045,17 @@
 
 character(len=metadatalength) :: prior_meta_data, posterior_meta_data
 character(len=metadatalength), allocatable :: state_meta(:)
-integer :: i, ensemble_offset, num_state_copies, num_obs_copies
+integer :: i, num_state_copies, num_obs_copies
 
 ! The 4 is for ensemble mean and spread plus inflation mean and spread
 ! The Prior file contains the prior inflation mean and spread only
 ! Posterior file contains the posterior inflation mean and spread only
-allocate(state_meta(num_output_state_members))!#! + 4))
+allocate(state_meta(num_output_state_members))
 
 num_state_copies = num_output_state_members
 
 ! Section for state variables + other generated data stored with them.
 
-!#! ! Ensemble mean goes first 
-!#! num_state_copies = num_output_state_members + 2
-!#! output_state_mean_index = 1
-!#! state_meta(output_state_mean_index) = 'ensemble mean'
-!#! 
-!#! ! Ensemble spread goes second
-!#! output_state_spread_index = 2
-!#! state_meta(output_state_spread_index) = 'ensemble spread'
-
 ! Check for too many output ensemble members
 if(num_output_state_members > 10000) then
    write(msgstring, *)'output metadata in filter needs state ensemble size < 10000, not ', &
@@ -1073,23 +1063,11 @@
    call error_handler(E_ERR,'filter_generate_copy_meta_data',msgstring,source,revision,revdate)
 endif
 
-! Compute starting point for ensemble member output
-ensemble_offset = 0!#!2
-
 ! Set up the metadata for the output state diagnostic files
 do i = 1, num_output_state_members
-   write(state_meta(i + ensemble_offset), '(a15, 1x, i6)') 'ensemble member', i
+   write(state_meta(i), '(a15, 1x, i6)') 'ensemble member', i
 end do
 
-! Next two slots are for inflation mean and sd metadata
-! To avoid writing out inflation values to the Prior and Posterior netcdf files,
-! set output_inflation to false in the filter section of input.nml 
-!#! if(output_inflation) then
-!#!    num_state_copies = num_state_copies + 2
-!#!    state_meta(num_state_copies-1) = 'inflation mean'
-!#!    state_meta(num_state_copies)   = 'inflation sd'
-!#! endif
-
 ! Set up diagnostic output for model state, if output is desired
 PreAssimStateUnit  = init_singlefile_output('filter_preassim', 'preassim ensemble state', &
                                       num_state_copies, state_meta, output_mean, output_sd, &