[Dart-dev] DART/branches Revision: 10793

[dart at ucar.edu]

hendric at ucar.edu
2016-12-15 15:12:52 -0700 (Thu, 15 Dec 2016)
132
removing unneeded code from io modules.  checking to make 
sure that you have a valid copy number when setting
file_info metadata.




Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-15 21:20:27 UTC (rev 10792)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-15 22:12:52 UTC (rev 10793)
@@ -74,7 +74,7 @@
 use state_space_diag_mod,  only : init_state_space_diag, netcdf_file_type
 
 ! state copy meta data
-use copies_on_off_mod, only : query_copy_present, print_copy_info, COPY_NOT_PRESENT
+use copies_on_off_mod, only : query_copy_present, COPY_NOT_PRESENT
 
 !------------------------------------------------------------------------------
 
@@ -470,10 +470,10 @@
                           PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
                           POST_INF_COPY, POST_INF_SD_COPY)
 
-call set_inflation_mean_copy(prior_inflate,     PRIOR_INF_COPY)
-call set_inflation_sd_copy(  prior_inflate,     PRIOR_INF_SD_COPY)
-call set_inflation_mean_copy(post_inflate, POST_INF_COPY)
-call set_inflation_sd_copy(  post_inflate, POST_INF_SD_COPY)
+call set_inflation_mean_copy(prior_inflate, PRIOR_INF_COPY)
+call set_inflation_sd_copy(  prior_inflate, PRIOR_INF_SD_COPY)
+call set_inflation_mean_copy(post_inflate,  POST_INF_COPY)
+call set_inflation_sd_copy(  post_inflate,  POST_INF_SD_COPY)
 
 if (.not. silence) then  !>@todo abuse of the 'silence' variable
    call file_info_dump(file_info_input,     'filter:input')
@@ -2149,7 +2149,7 @@
 call set_file_metadata(file_info, POST_INF_MEAN,  stage, 'postinf_mean',  'posterior inflation mean')
 call set_file_metadata(file_info, POST_INF_SD,    stage, 'postinf_sd',    'posterior inflation sd')
 
-if (my_task_id() == 0) call file_info_dump(file_info, stage)
+! if (my_task_id() == 0) call file_info_dump(file_info, stage)
 
 end subroutine set_file_info
 
@@ -2203,7 +2203,7 @@
 integer,              intent(in)    :: POST_INF_MEAN
 integer,              intent(in)    :: POST_INF_SD
 
-if ( output_restarts ) call set_io_copy_flag(file_info, MEM_START, MEM_START+num_ens-1, WRITE_COPY)
+if ( output_restarts )      call set_io_copy_flag(file_info, MEM_START, MEM_START+num_ens-1, WRITE_COPY)
 
 if ( output_mean )          call set_io_copy_flag(file_info, ENS_MEAN,       WRITE_COPY)
 if ( output_sd )            call set_io_copy_flag(file_info, ENS_SD,         WRITE_COPY)

Modified: DART/branches/rma_fixed_filenames/io/copies_on_off_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/copies_on_off_mod.f90	2016-12-15 21:20:27 UTC (rev 10792)
+++ DART/branches/rma_fixed_filenames/io/copies_on_off_mod.f90	2016-12-15 22:12:52 UTC (rev 10793)
@@ -10,28 +10,10 @@
 !> @{
 !> @brief IO storage module
 !>
-!> This module stores 2 things necessary for state IO:
-!>    1. Which copies to read and write.
-!>    2. Which copy number is associated with each named copy (e.g POST_INF_COPY = 5)
-!>
-!> Usage for read:
-!>    call setup_read_write(num_copies)  
-!>    call turn_read_copy_on(1,ens_size)
-!>    call turn_read_copy_on(mean)
-!>    --- IO is done ---
-!>    call end_read_write
-!>  
 !>  The IO routines use 
 !>     query_read_copy(copy) 
 !> to find out whether a copy needs to be read.
 !>
-!> Usage for write:
-!>    call setup_read_write(num_copies)  
-!>    call turn_write_copy_on(1:ens_size)
-!>    call turn_write_copy_on(mean)
-!>    --- IO is done ---
-!>    call end_read_write
-!>  
 !>  The IO routines use 
 !>     query_write_copy(copy)
 !> to find out whether a copy needs to be written.
@@ -74,177 +56,22 @@
 character(len=32 ), parameter :: revision = "$Revision$"
 character(len=128), parameter :: revdate  = "$Date$"
 
-public :: setup_read_write, end_read_write
-public :: query_read_copy, query_write_copy
-public :: turn_read_copy_on, turn_read_copies_off
+public :: query_read_copy,    query_write_copy
+public :: turn_read_copy_on,  turn_read_copies_off
 public :: turn_write_copy_on, turn_write_copy_off
-!public :: has_units, is_mean_copy, is_sd_copy, is_ensemble_copy
 
 ! These are public integers for now.  
 ! There is no protection against code using this module changing the
 ! value of these integers.
-public :: query_copy_present, COPY_NOT_PRESENT, &
-          print_copy_info
-          !#! ens_copy_type          
-          !#! ENS_MEAN_COPY, ENS_SD_COPY, &
-          !#! PRIOR_INF_COPY, PRIOR_INF_SD_COPY, &
-          !#! POST_INF_COPY, POST_INF_SD_COPY, &