[Dart-dev] DART/branches Revision: 10777

[dart at ucar.edu]

hendric at ucar.edu
2016-11-29 16:32:47 -0700 (Tue, 29 Nov 2016)
204
Writting preassim and postassim files using existing write_state()
code.  Only writting out stages for inflation in 'output' and now
have the option to write out mean and standard deviation for 'input'.




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-23 22:43:09 UTC (rev 10776)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-11-29 23:32:47 UTC (rev 10777)
@@ -170,7 +170,7 @@
 subroutine adaptive_inflate_init(inflate_handle, inf_flavor, mean_from_restart, &
    sd_from_restart, output_inflation, deterministic, & 
    inf_initial, sd_initial, inf_lower_bound, inf_upper_bound, &
-   sd_lower_bound, ens_handle, ss_inflate_index, ss_inflate_sd_index, missing_ok, label)
+   sd_lower_bound, ens_handle, missing_ok, label)
 
 ! Initializes an adaptive_inflate_type 
 
@@ -184,7 +184,6 @@
 real(r8),                    intent(in)    :: inf_lower_bound, inf_upper_bound
 real(r8),                    intent(in)    :: sd_lower_bound
 type(ensemble_type),         intent(inout) :: ens_handle
-integer,                     intent(in)    :: ss_inflate_index, ss_inflate_sd_index
 logical,                     intent(in)    :: missing_ok
 character(len = *),          intent(in)    :: label
 
@@ -236,7 +235,7 @@
 ! Read type 1 (observation space inflation)
 if(inf_flavor == 1) then
 
-   write(msgstring,  *) 'No longer supporting observaltion space inflation ', &
+   write(msgstring,  *) 'No longer supporting observation space inflation ', &
                         '(i.e. inf_flavor = 1).'
    write(msgstring2, *) 'Please contact dart at ucar.edu if you would like to use ', &
                         'observation space inflation'

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-23 22:43:09 UTC (rev 10776)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-29 23:32:47 UTC (rev 10777)
@@ -63,15 +63,15 @@
 
 use state_vector_io_mod,   only : state_vector_io_init, read_state, write_state, &
                                   get_output_preassim, get_output_postassim, &
-                                  get_output_mean, get_output_sd
+                                  get_output_mean, get_output_sd, get_output_input
 
 use io_filenames_mod,      only : io_filenames_init, file_info_type, file_info_dump, &
-                                  set_file_metadata, stage_metadata_type
+                                  set_file_metadata
 
 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_assim_files, netcdf_file_type, &
+use state_space_diag_mod,  only : init_state_space_diag, netcdf_file_type, &
                                   get_num_output_state_members, set_num_output_state_members
 
 ! state copy meta data
@@ -79,7 +79,8 @@
                               PRIOR_INF_SD_COPY,POST_INF_COPY, POST_INF_SD_COPY, &
                               SPARE_PRIOR_MEAN, SPARE_PRIOR_SPREAD, SPARE_PRIOR_INF_MEAN, &
                               SPARE_PRIOR_INF_SPREAD, SPARE_POST_INF_MEAN, &
-                              SPARE_POST_INF_SPREAD, query_copy_present
+                              SPARE_POST_INF_SPREAD, query_copy_present, &
+                              set_has_units
 
 !------------------------------------------------------------------------------
 
@@ -289,15 +290,15 @@
 
 ! Initialize the adaptive inflation module
 call adaptive_inflate_init(prior_inflate, inf_flavor(1), inf_initial_from_restart(1), &
-   inf_sd_initial_from_restart(1), output_inflation, inf_deterministic(1),       &
+   inf_sd_initial_from_restart(1), output_inflation, inf_deterministic(1),            &
    inf_initial(1), inf_sd_initial(1), inf_lower_bound(1), inf_upper_bound(1),         &
-   inf_sd_lower_bound(1), state_ens_handle, PRIOR_INF_COPY, PRIOR_INF_SD_COPY,        &
+   inf_sd_lower_bound(1), state_ens_handle,                                           &
    allow_missing, 'Prior')
 
 call adaptive_inflate_init(post_inflate, inf_flavor(2), inf_initial_from_restart(2),  &
-   inf_sd_initial_from_restart(2), output_inflation, inf_deterministic(2),       &
+   inf_sd_initial_from_restart(2), output_inflation, inf_deterministic(2),            &
    inf_initial(2),  inf_sd_initial(2), inf_lower_bound(2), inf_upper_bound(2),        &
-   inf_sd_lower_bound(2), state_ens_handle, POST_INF_COPY, POST_INF_SD_COPY,          &
+   inf_sd_lower_bound(2), state_ens_handle,                                           &
    allow_missing, 'Posterior')
 
 if (do_output()) then
@@ -318,7 +319,7 @@
 
 ! Can't output more ensemble members than exist
 if(get_num_output_state_members() > ens_size) call set_num_output_state_members(ens_size)
-if(num_output_obs_members   > ens_size) num_output_obs_members   = ens_size
+if(num_output_obs_members         > ens_size) num_output_obs_members = ens_size
 
 ! State
 call set_state_copies(ens_size, num_extras)
@@ -601,6 +602,11 @@
       call trace_message('After  prior inflation damping and prep')
    endif
 
+   if (get_output_input()) then
+     call write_state(state_ens_handle, file_info_input, num_members=0)
+   endif
+