[Dart-dev] DART/branches Revision: 10736

dart at ucar.edu dart at ucar.edu
Mon Nov 7 16:22:42 MST 2016


hendric at ucar.edu
2016-11-07 16:22:42 -0700 (Mon, 07 Nov 2016)
121
removing output_inf_restart from all modules.
using inflation flavor to determine if we should
output infaltion or not.




Modified: DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-11-07 22:37:17 UTC (rev 10735)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-11-07 23:22:42 UTC (rev 10736)
@@ -31,7 +31,7 @@
           deterministic_inflate,      solve_quadratic,                                   &
           log_inflation_info,         get_minmax_task_zero,          mean_from_restart,  &
           sd_from_restart,                                                               &
-          output_inf_restart,         get_inflate_mean,              get_inflate_sd,     &
+                                      get_inflate_mean,              get_inflate_sd,     &
           get_is_prior,               get_is_posterior,              do_ss_inflate
 
 
@@ -101,17 +101,6 @@
 end function sd_from_restart
 
 !------------------------------------------------------------------
-
-function output_inf_restart(inflation)
-
-type(adaptive_inflate_type) :: inflation
-logical :: output_inf_restart
-
-output_inf_restart = inflation%output_restart
-
-end function output_inf_restart
-
-!------------------------------------------------------------------
 function get_inflate_mean(inflation)
 
 type(adaptive_inflate_type) :: inflation

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-07 22:37:17 UTC (rev 10735)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-07 23:22:42 UTC (rev 10736)
@@ -62,14 +62,15 @@
 use random_seq_mod,        only : random_seq_type, init_random_seq, random_gaussian
 
 use state_vector_io_mod,   only : state_vector_io_init, read_state, write_state, &
-                                  get_output_preassim, get_output_mean, get_output_sd
+                                  get_output_preassim, get_output_postassim, &
+                                  get_output_mean, get_output_sd
 
 use io_filenames_mod,      only : io_filenames_init, file_info_type
 
 use forward_operator_mod,  only : get_obs_ens_distrib_state
 use quality_control_mod,   only : initialize_qc
 
-use state_space_diag_mod,  only : init_state_space_diag, write_preassim_files, netcdf_file_type, &
+use state_space_diag_mod,  only : init_state_space_diag, write_assim_files, netcdf_file_type, &
                                   get_num_output_state_members, set_num_output_state_members
 
 ! state copy meta data
@@ -615,7 +616,7 @@
        (time_step_number / output_interval * output_interval == time_step_number)) then
 
       if (get_output_preassim()) then
-        call write_preassim_files(state_ens_handle, file_info, &
+        call write_assim_files(state_ens_handle, file_info, &
               ENS_MEAN_COPY, ENS_SD_COPY, PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
               do_inflation)
       endif
@@ -744,22 +745,21 @@
    ! gone in Posterior_Diag.nc and write them at the end
    call store_posterior(state_ens_handle)
 
-   !>@todo FIXME JPH: Do we need this any longer?
-   !JPH! if ((output_interval > 0) .and. &
-   !JPH!       (time_step_number / output_interval * output_interval == time_step_number)) then
+   !>todo FIXME JPH: option to write copies after inflation and before
+   !> posterior inflation.
+   ! if ((output_interval > 0) .and. &
+   !     (time_step_number / output_interval * output_interval == time_step_number)) then
+   !    if (get_output_postassim()) then
+   !      call write_assim_files(state_ens_handle, file_info, &
+   !            ENS_MEAN_COPY, ENS_SD_COPY, PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
+   !            do_inflation)
+   !    endif
+   !    !> @todo What to do here?
+   !    !call smoother_ss_diagnostics(model_size, get_num_output_state_members(), &
+   !    !  output_inflation, temp_ens, ENS_MEAN_COPY, ENS_SD_COPY, &
+   !    ! POST_INF_COPY, POST_INF_SD_COPY)
+   ! endif
 
-   !JPH!    call filter_state_space_diagnostics(file_info, curr_ens_time, state_ens_handle, &
-   !JPH!          model_size, output_state_mean_index, &
-   !JPH!          output_state_spread_index, .true., &
-   !JPH!          ENS_MEAN_COPY, ENS_SD_COPY, &
-   !JPH!          post_inflate, POST_INF_COPY, POST_INF_SD_COPY)
-   !JPH!    ! Cyclic storage for lags with most recent pointed to by smoother_head
-   !JPH!    !> @todo What to do here?
-   !JPH!    !call smoother_ss_diagnostics(model_size, get_num_output_state_members(), &
-   !JPH!    !  output_inflation, temp_ens, ENS_MEAN_COPY, ENS_SD_COPY, &
-   !JPH!    ! POST_INF_COPY, POST_INF_SD_COPY)
-   !JPH! endif
-
    call timestamp_message('After  posterior state space diagnostics')
    call trace_message('After  posterior state space diagnostics')
 

Modified: DART/branches/rma_fixed_filenames/io/state_space_diag_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/state_space_diag_mod.f90	2016-11-07 22:37:17 UTC (rev 10735)
+++ DART/branches/rma_fixed_filenames/io/state_space_diag_mod.f90	2016-11-07 23:22:42 UTC (rev 10736)
@@ -95,7 +95,7 @@
 
 private
 
-public :: write_preassim_files, &
+public :: write_assim_files, &
           init_state_space_diag, &
           netcdf_file_type, &
           init_diag_output, &
@@ -315,8 +315,9 @@
 !> step runs. Only need to output state netcdf files if this is the prior
 !> and num_output_state_members > 0. If this is single time step and the
 !> posterior, then the output members are the restart files.
-subroutine write_preassim_files(ens_handle, file_info, &
-             ENS_MEAN_COPY, ENS_SD_COPY, INF_COPY, INF_SD_COPY, do_inflation)
+subroutine write_assim_files(ens_handle, file_info, &
+             ENS_MEAN_COPY, ENS_SD_COPY, INF_COPY, INF_SD_COPY, &
+             do_inflation)
 
 type(ensemble_type),  intent(inout) :: ens_handle
 type(file_info_type), intent(in)    :: file_info
@@ -333,10 +334,12 @@
       call turn_write_copy_on(INF_SD_COPY)
    endif
    call filter_write_restart_direct(ens_handle, file_info%restart_files_out_prior)
+   !>@todo option to write copies after inflation prior to posterior inflation
+   ! call filter_write_restart_direct(ens_handle, file_info%restart_files_out_post)
    call end_read_write()
 endif
 
-end subroutine write_preassim_files
+end subroutine write_assim_files
 
 
 !--------------------------------------------------------------------------------

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-07 22:37:17 UTC (rev 10735)
+++ DART/branches/rma_fixed_filenames/io/state_vector_io_mod.f90	2016-11-07 23:22:42 UTC (rev 10736)
@@ -33,7 +33,6 @@
 
 use adaptive_inflate_mod, only : adaptive_inflate_type, mean_from_restart, sd_from_restart, &
                                  do_single_ss_inflate, do_varying_ss_inflate, &
-                                 output_inf_restart, &
                                  get_inflate_mean, get_inflate_sd, do_ss_inflate, &
                                  get_is_prior, get_is_posterior
 


More information about the Dart-dev mailing list