[Dart-dev] DART/branches Revision: 10809

[dart at ucar.edu]

nancy at ucar.edu
2016-12-16 14:50:29 -0700 (Fri, 16 Dec 2016)
127
update test_grid to use new interface to setting/getting filenames.
add missing module to create_fixed_network_seq pathnames.




Modified: DART/branches/rma_fixed_filenames/models/ROMS/test_grid.f90
===================================================================
--- DART/branches/rma_fixed_filenames/models/ROMS/test_grid.f90	2016-12-16 21:28:53 UTC (rev 10808)
+++ DART/branches/rma_fixed_filenames/models/ROMS/test_grid.f90	2016-12-16 21:50:29 UTC (rev 10809)
@@ -42,8 +42,8 @@
 
 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
+use      io_filenames_mod, only : io_filenames_init, file_info_type, get_restart_filename, &
+                                  stage_metadata_type, get_stage_metadata
 
 use             model_mod, only : static_init_model, get_model_size, &
                                   get_state_meta_data,       &
@@ -95,9 +95,11 @@
 ! io variables
 integer :: iunit, io
 integer :: ios_out
-type(file_info_type) :: file_info
+type(file_info_type) :: input_file_info, output_file_info
+type(stage_metadata_type) :: stage_info
 logical              :: read_time_from_file = .true.
 
+
 ! model state variables
 type(ensemble_type) :: ens_handle
 
@@ -157,19 +159,21 @@
 call init_ensemble_manager(ens_handle, num_ens, model_size)
 
 ! Reading netcdf restart file:
-file_info = io_filenames_init(ens_handle, .false., .false., restart_in_file_name, restart_out_file_name, output_restart=.true., netcdf_read=.true., netcdf_write=.true.)
+input_file_info = io_filenames_init(num_ens, .false., root_name='input')
+output_file_info = io_filenames_init(num_ens, .false., root_name='output')
 
 
-
 !----------------------------------------------------------------------
 ! Open a test netcdf initial conditions file.
 !----------------------------------------------------------------------
-if ( do_output() ) write(*,*) 'Reading File : ', trim( get_input_file(file_info%restart_files_in, mem, domain=dom) )
-call read_state(ens_handle, file_info,  read_time_from_file, time1)
+stage_info = get_stage_metadata(input_file_info)
+if ( do_output() ) write(*,*) 'Reading File : ', trim( get_restart_filename(stage_info, mem, domain=dom) )
+call read_state(ens_handle, input_file_info,  read_time_from_file, time1)
 model_time = time1
 
-if ( do_output() ) write(*,*) 'Writing File : ', trim( get_output_file(file_info%restart_files_out, mem, domain=dom) )
-call write_state(ens_handle, file_info)
+stage_info = get_stage_metadata(output_file_info)
+if ( do_output() ) write(*,*) 'Writing File : ', trim( get_restart_filename(stage_info, mem, domain=dom) )
+call write_state(ens_handle, output_file_info)
 
 write(*,*) 
 call print_date( model_time,' test_grid:model date')

Modified: DART/branches/rma_fixed_filenames/models/ROMS/work/path_names_create_fixed_network_seq
===================================================================
--- DART/branches/rma_fixed_filenames/models/ROMS/work/path_names_create_fixed_network_seq	2016-12-16 21:28:53 UTC (rev 10808)
+++ DART/branches/rma_fixed_filenames/models/ROMS/work/path_names_create_fixed_network_seq	2016-12-16 21:50:29 UTC (rev 10809)
@@ -3,7 +3,6 @@
 distributed/distributed_state_mod.f90
 distributed/null_win_mod.f90
 ensemble_manager/ensemble_manager_mod.f90
-io/copies_on_off_mod.f90
 io/dart_time_io_mod.f90
 io/state_structure_mod.f90
 location/threed_sphere/location_mod.f90