[Dart-dev] DART/branches Revision: 10787

[dart at ucar.edu]

hendric at ucar.edu
2016-12-14 16:43:16 -0700 (Wed, 14 Dec 2016)
136
moved the mean and sd inflation copies into the adaptive infation
module.  setting the read write copies separately from the metadata.




Modified: DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-12-13 23:12:46 UTC (rev 10786)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-12-14 23:43:16 UTC (rev 10787)
@@ -32,7 +32,9 @@
           log_inflation_info,         get_minmax_task_zero,          mean_from_restart,  &
           sd_from_restart,                                                               &
           output_inf_restart,         get_inflate_mean,              get_inflate_sd,     &
-          get_is_prior,               get_is_posterior,              do_ss_inflate
+          get_is_prior,               get_is_posterior,              do_ss_inflate,      &
+          set_inflation_mean_copy,    set_inflation_sd_copy,         get_inflation_mean_copy, &
+          get_inflation_sd_copy
 
 
 ! version controlled file description for error handling, do not edit
@@ -66,6 +68,8 @@
    logical               :: sd_from_restart
    logical               :: prior = .false.
    logical               :: posterior = .false.
+   integer               :: input_mean_copy = -1 !>todo NO_COPY_PRESENT
+   integer               :: input_sd_copy   = -1
 end type adaptive_inflate_type
 
 ! Module storage for writing error messages
@@ -790,6 +794,47 @@
 
 end subroutine get_minmax_task_zero
 
+!-----------------------------------------------------------------------
+
+subroutine set_inflation_mean_copy(inflation_handle, c)
+type(adaptive_inflate_type), intent(inout) :: inflation_handle
+integer,                     intent(in)    :: c
+
+inflation_handle%input_mean_copy = c
+
+end subroutine set_inflation_mean_copy
+
+!-----------------------------------------------------------------------
+
+subroutine set_inflation_sd_copy(inflation_handle, c)
+type(adaptive_inflate_type), intent(inout) :: inflation_handle
+integer,                     intent(in)    :: c
+
+inflation_handle%input_sd_copy = c
+
+end subroutine set_inflation_sd_copy
+
+!-----------------------------------------------------------------------
+
+function get_inflation_mean_copy(inflation_handle) result (c)
+type(adaptive_inflate_type), intent(in) :: inflation_handle
+integer :: c
+
+c = inflation_handle%input_mean_copy
+
+end function get_inflation_mean_copy
+
+!-----------------------------------------------------------------------
+
+function get_inflation_sd_copy(inflation_handle) result (c)
+type(adaptive_inflate_type), intent(in) :: inflation_handle
+integer :: c
+
+c = inflation_handle%input_sd_copy
+
+end function get_inflation_sd_copy
+
+
 !========================================================================
 ! end module adaptive_inflate_mod
 !========================================================================

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-13 23:12:46 UTC (rev 10786)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-14 23:43:16 UTC (rev 10787)
@@ -48,8 +48,8 @@
                                   get_single_copy, put_single_copy, deallocate_single_copy
 use adaptive_inflate_mod,  only : do_varying_ss_inflate,                &
                                   do_single_ss_inflate, inflate_ens, adaptive_inflate_init,   &
-                                  adaptive_inflate_type,                      &
-                                  log_inflation_info, &
+                                  adaptive_inflate_type, set_inflation_mean_copy ,            &
+                                  log_inflation_info, set_inflation_sd_copy,                  &
                                   get_minmax_task_zero
 use mpi_utilities_mod,     only : my_task_id, task_sync, broadcast_send, broadcast_recv,      &
                                   task_count
@@ -66,7 +66,7 @@
 
 use io_filenames_mod,      only : io_filenames_init, file_info_type, file_info_dump, &
                                   combine_file_info, set_file_metadata, set_member_file_metadata, &
-                                  READ_COPY, WRITE_COPY, READ_WRITE_COPY
+                                  READ_COPY, WRITE_COPY, READ_WRITE_COPY, set_io_copy_flag
 
 use forward_operator_mod,  only : get_obs_ens_distrib_state
 use quality_control_mod,   only : initialize_qc
@@ -129,6 +129,9 @@
 integer :: POSTASSIM_POSTINF_MEAN   = COPY_NOT_PRESENT
 integer :: POSTASSIM_POSTINF_SD     = COPY_NOT_PRESENT