[Dart-dev] DART/branches Revision: 10766

[dart at ucar.edu]

nancy at ucar.edu
2016-11-18 10:28:49 -0700 (Fri, 18 Nov 2016)
37
updates for revised i/o interfaces.




Modified: DART/branches/rma_fixed_filenames/models/model_mod_tools/model_mod_check.f90
===================================================================
--- DART/branches/rma_fixed_filenames/models/model_mod_tools/model_mod_check.f90	2016-11-18 17:15:20 UTC (rev 10765)
+++ DART/branches/rma_fixed_filenames/models/model_mod_tools/model_mod_check.f90	2016-11-18 17:28:49 UTC (rev 10766)
@@ -44,7 +44,9 @@
 use            filter_mod, only : filter_set_initial_time
 
 use      io_filenames_mod, only : io_filenames_init, file_info_type,        &
-                                  get_input_file, get_output_file
+                                  restart_names_type, get_restart_files, &
+                                  get_restart_filename
+                                  
 
 use             model_mod, only : static_init_model, get_model_size, &
                                   get_state_meta_data,       &
@@ -106,7 +108,8 @@
 ! io variables
 integer :: iunit, io
 integer, allocatable :: ios_out(:)
-type(file_info_type) :: file_info
+type(file_info_type) :: file_info_input, file_info_output
+type(restart_names_type) :: input_restart_files, output_restart_files
 logical              :: read_time_from_file = .true.
 
 ! model state variables
@@ -181,32 +184,33 @@
 ! Set up the ensemble storage and read in the restart file
 call init_ensemble_manager(ens_handle, num_ens, model_size)
 
-! Reading netcdf restart file:
-file_info = io_filenames_init(ens_handle, single_restart_file_in  = .false., &
-                                          single_restart_file_out = .false., &
-                                          input_restart_list      = input_restart_list, &
-                                          output_restart_list     = output_restart_list)
+! Reading/writing netcdf restart files:
+file_info_input  = io_filenames_init(ens_handle, single_file = .false., &
+                                     restart_list = input_restart_list)
+file_info_output = io_filenames_init(ens_handle, single_file = .false., &
+                                     restart_list = output_restart_list)
 
 
-
 !----------------------------------------------------------------------
 ! Open a test netcdf initial conditions file.
 !----------------------------------------------------------------------
+input_restart_files = get_restart_files(file_info_input)
 num_domains = get_num_domains()
 do idom = 1, num_domains
    do imem = 1, num_ens
-      if ( do_output() ) write(*,*) 'Reading File : ', trim( get_input_file(file_info%restart_files_in, imem, domain=idom) )
+      if ( do_output() ) write(*,*) 'Reading File : ', trim( get_restart_filename(input_restart_files, imem, domain=idom) )
    enddo
 enddo
-call read_state(ens_handle, file_info,  read_time_from_file, time1)
+call read_state(ens_handle, file_info_input,  read_time_from_file, time1)
 model_time = time1
 
+output_restart_files = get_restart_files(file_info_output)
 do idom = 1, num_domains
    do imem = 1, num_ens
-      if ( do_output() ) write(*,*) 'Writing File : ', trim( get_output_file(file_info%restart_files_out, imem, domain=idom) )
+      if ( do_output() ) write(*,*) 'Writing File : ', trim( get_restart_filename(output_restart_files, imem, domain=idom) )
    enddo
 enddo
-call write_state(ens_handle, file_info)
+call write_state(ens_handle, file_info_output)
 
 write(*,*) 
 call print_date( model_time,' model_mod_check:model date')