[Dart-dev] DART/branches Revision: 10992

[dart at ucar.edu]

hendric at ucar.edu
2017-02-03 10:34:18 -0700 (Fri, 03 Feb 2017)
278
Need to set the number of output state variables for 
True_State, otherwise the member dimension will be
defined as the unlimited dimension.  There is a bug
in the bgrid_solo model.  The True_State.nc file does
not seem to be appending time. Everything should compile
and run.




Modified: DART/branches/rma_single_file/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_single_file/filter/filter_mod.f90	2017-02-03 17:20:50 UTC (rev 10991)
+++ DART/branches/rma_single_file/filter/filter_mod.f90	2017-02-03 17:34:18 UTC (rev 10992)
@@ -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, netcdf_file_type, &
+                                  set_member_file_metadata, &
                                   set_io_copy_flag, check_file_info_variable_shape, &
                                   query_copy_present, COPY_NOT_PRESENT, &
                                   READ_COPY, WRITE_COPY, READ_WRITE_COPY
@@ -988,30 +988,8 @@
 ! output file which contains both prior and posterior data.
 
 character(len=metadatalength) :: prior_meta_data, posterior_meta_data
-character(len=metadatalength), allocatable :: state_meta(:)
 integer :: i, num_state_copies, num_obs_copies
 
-! The 4 is for ensemble mean and spread plus inflation mean and spread
-! The Prior file contains the prior inflation mean and spread only
-! Posterior file contains the posterior inflation mean and spread only
-allocate(state_meta(num_output_state_members))
-
-num_state_copies = num_output_state_members
-
-! Section for state variables + other generated data stored with them.
-
-! Check for too many output ensemble members
-if(num_output_state_members > 10000) then
-   write(msgstring, *)'output metadata in filter needs state ensemble size < 10000, not ', &
-                      num_output_state_members
-   call error_handler(E_ERR,'filter_generate_copy_meta_data',msgstring,source,revision,revdate)
-endif
-
-! Set up the metadata for the output state diagnostic files
-do i = 1, num_output_state_members
-   write(state_meta(i), '(a15, 1x, i6)') 'ensemble member', i
-end do
-
 ! Set the metadata for the observations.
 
 ! Set up obs ensemble mean
@@ -2218,7 +2196,6 @@
                                             restart_list=input_restart_file_list,  &
                                             single_filename = 'filter_input.nc', &
                                             root_name='input')
-!#! call file_info_dump(file_info_input, 'after init:file_info_input')    
 call io_filenames_init(file_info_preassim,  num_state_ens_copies, single_file_out,     &
                                             single_filename = 'filter_preassim.nc', &
                                             root_name='preassim')
@@ -2231,11 +2208,6 @@
                                             root_name='output', &
                                             check_output_compatibility = .true.)
 
-!#! call file_info_dump(file_info_input,     'file_info_input')    
-!#! call file_info_dump(file_info_preassim,  'file_info_preassim')    
-!#! call file_info_dump(file_info_postassim, 'file_info_postassim')    
-!#! call file_info_dump(file_info_output,    'file_info_output')    
-
 ! Set filename information
 call set_filename_info(file_info_input,    'input', ens_size, &
                        ENS_MEM_START, ENS_MEM_END, INPUT_MEAN, INPUT_SD,      &

Modified: DART/branches/rma_single_file/integrate_model/integrate_model.f90
===================================================================
--- DART/branches/rma_single_file/integrate_model/integrate_model.f90	2017-02-03 17:20:50 UTC (rev 10991)
+++ DART/branches/rma_single_file/integrate_model/integrate_model.f90	2017-02-03 17:34:18 UTC (rev 10992)
@@ -133,7 +133,7 @@
 
    !------------------- Read restart from file ----------------------
    
-   input_file_info = io_filenames_init(1, single_file=.false.)
+   call io_filenames_init(input_file_info, 1, single_file=.false.)
    call set_file_metadata(input_file_info, 1, 'temp', 'ic', 'initial condition')
    call set_io_copy_flag( input_file_info, 1, READ_COPY) 
    
@@ -151,7 +151,7 @@
    ! If the model time is past the obs set time, just need to skip
    if (trace_execution) write(*,*) 'calling advance_state if needed'
 
-   output_file_info = io_filenames_init(1, single_file=.false.)
+   call io_filenames_init(output_file_info, 1, single_file=.false.)
    call set_file_metadata(output_file_info, 1, 'temp', 'ud', 'advanced member')
    call set_io_copy_flag( output_file_info, 1, WRITE_COPY) 
 

Modified: DART/branches/rma_single_file/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_single_file/io/direct_netcdf_mod.f90	2017-02-03 17:20:50 UTC (rev 10991)
+++ DART/branches/rma_single_file/io/direct_netcdf_mod.f90	2017-02-03 17:34:18 UTC (rev 10992)
@@ -79,14 +79,13 @@
                                  get_units, get_long_name, get_short_name, &
                                  get_has_missing_value, get_FillValue, &
                                  get_missing_value, get_add_offset, &
-                                 get_scale_factor, get_xtype, get_num_domains
+                                 get_scale_factor, get_xtype
 
 use io_filenames_mod,     only : get_restart_filename, copy_has_units, &
                                  stage_metadata_type, get_file_description, &