[Dart-dev] DART/branches Revision: 10819

[dart at ucar.edu]

hendric at ucar.edu
2016-12-20 11:13:29 -0700 (Tue, 20 Dec 2016)
290
removing unused variables. updating comments.  moving
initialization of filenames into one subroutine instead
of in the middle of filter for clarity. adding back in
the check file shape routine to make sure that the 
netcdf variables that are being written to a files have
the same shape.




Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-19 21:39:50 UTC (rev 10818)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-12-20 18:13:29 UTC (rev 10819)
@@ -65,14 +65,14 @@
                                   set_stage_to_write, get_stage_to_write
 
 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, set_io_copy_flag
+                                  combine_file_info, set_file_metadata,  &
+                                  set_member_file_metadata, &
+                                  READ_COPY, WRITE_COPY, READ_WRITE_COPY, &
+                                  set_io_copy_flag, check_file_info_variable_shape
 
 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, netcdf_file_type
-
 ! state copy meta data
 use copies_on_off_mod, only : query_copy_present, COPY_NOT_PRESENT
 
@@ -99,6 +99,9 @@
 
 ! Defining whether diagnostics are for prior or posterior
 integer, parameter :: PRIOR_DIAG = 0, POSTERIOR_DIAG = 2
+
+! Determine if inflation it turned on or off for reading and writing
+! inflation restart files
 logical :: output_inflation = .false.
 
 ! Ensemble copy numbers
@@ -151,6 +154,7 @@
 integer  :: obs_window_days     = -1
 integer  :: obs_window_seconds  = -1
 ! Control diagnostic output for state variables
+integer  :: num_output_state_members = 0
 integer  :: num_output_obs_members   = 0
 integer  :: output_interval     = 1
 integer  :: num_groups          = 1
@@ -172,8 +176,7 @@
 logical            :: single_file_out              = .false. ! all copies written to 1 file
 ! Stages to write
 character(len=10)  :: stages_to_write(4) = (/"null      ", "null      ", "null      ", "output    "/) ! input, preassim, postassim, output
-integer :: num_output_state_members = 0
-logical :: output_restarts  = .true. 
+logical :: output_restarts  = .true. !>@todo rename to output_members
 logical :: output_mean      = .true.
 logical :: output_sd        = .true.
 logical :: write_all_stages_at_end = .false.
@@ -202,28 +205,27 @@
 real(r8)             :: inf_upper_bound(2)        = 1000000.0_r8
 real(r8)             :: inf_sd_lower_bound(2)     = 0.0_r8
 
-namelist /filter_nml/ async, adv_ens_command, ens_size, &
-   tasks_per_model_advance, &
-   obs_sequence_in_name, obs_sequence_out_name, &
+namelist /filter_nml/ async, adv_ens_command, ens_size, tasks_per_model_advance, &
+   output_restarts, obs_sequence_in_name, obs_sequence_out_name, &
    init_time_days, init_time_seconds, &
    first_obs_days, first_obs_seconds, last_obs_days, last_obs_seconds, &
    obs_window_days, obs_window_seconds, &
-   num_output_obs_members, &
+   num_output_state_members, num_output_obs_members, &
    output_interval, num_groups, trace_execution, &
    output_forward_op_errors, output_timestamps, &
    inf_flavor, inf_initial_from_restart, inf_sd_initial_from_restart, &
    inf_deterministic, inf_damping, &
    inf_initial, inf_sd_initial, &
    inf_lower_bound, inf_upper_bound, inf_sd_lower_bound, &
-   silence, output_restart_file_list, &
-   distributed_state, input_restart_file_list, &
+   silence, &
+   distributed_state, &
    single_file_in, single_file_out, &
    perturb_from_single_instance, perturbation_amplitude, &
-   stages_to_write, num_output_state_members, &
-   output_restarts, output_mean, output_sd, write_all_stages_at_end 
+   stages_to_write, &
+   output_restart_file_list, input_restart_file_list, &
+   output_mean, output_sd, write_all_stages_at_end 
 
 
-
 !----------------------------------------------------------------
 
 contains
@@ -317,7 +319,7 @@
    endif
 end do
 
-! state space inflation is turned on, so we want to output inflation values
+! Check to see if state space inflation is turned on
 if (inf_flavor(1) > 1 )                           do_prior_inflate     = .true.
 if (inf_flavor(2) > 1 )                           do_posterior_inflate = .true.
 if (do_prior_inflate .or. do_posterior_inflate)   output_inflation     = .true.
@@ -364,7 +366,7 @@
 ! Set up stages to write : input, preassim, postassim, output
 call parse_stages_to_write(stages_to_write)