[Dart-dev] DART/branches Revision: 10764

[dart at ucar.edu]

nancy at ucar.edu
2016-11-18 09:03:39 -0700 (Fri, 18 Nov 2016)
191
fix the accessor routines for the restart filenames
in these files.   there is no longer a get_input_name
and get_output_name - you pass in an input or output
type and the name is returned.




Modified: DART/branches/rma_fixed_filenames/integrate_model/integrate_model.f90
===================================================================
--- DART/branches/rma_fixed_filenames/integrate_model/integrate_model.f90	2016-11-18 15:50:53 UTC (rev 10763)
+++ DART/branches/rma_fixed_filenames/integrate_model/integrate_model.f90	2016-11-18 16:03:39 UTC (rev 10764)
@@ -4,11 +4,19 @@
 !
 ! $Id$
 
-program integrate_model
+!> @todo FIXME:  i think this program needs to have 2 restart lists,
+!> one for input, one for output, and possibly an array of ensemble
+!> numbers (not sure about that), which it then uses the read_state()
+!> and write_state() routines to get and put the data after the
+!> model advances.
 
+
+
 ! Program to integrate assimilation model forward for asynchronous filter
 ! execution.
 
+program integrate_model
+
 use time_manager_mod,    only : time_type, operator(<), print_time
 use utilities_mod,       only : register_module,  &
                                 error_handler, E_MSG, nmlfileunit, &

Modified: DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90	2016-11-18 15:50:53 UTC (rev 10763)
+++ DART/branches/rma_fixed_filenames/io/direct_netcdf_mod.f90	2016-11-18 16:03:39 UTC (rev 10764)
@@ -81,7 +81,7 @@
                                  get_missing_value, get_add_offset, &
                                  get_scale_factor, get_xtype, get_num_domains
 
-use io_filenames_mod,     only : get_input_file, get_output_file, &
+use io_filenames_mod,     only : get_restart_filename, &
                                  restart_names_type, get_file_description
 
 use copies_on_off_mod,    only : query_read_copy, query_write_copy, &
@@ -195,7 +195,7 @@
 
    ! open netcdf file
    if (query_read_copy(copy)) then
-      netcdf_filename = get_input_file(name_handle, copy, domain)
+      netcdf_filename = get_restart_filename(name_handle, copy, domain)
       ret = nf90_open(netcdf_filename, NF90_NOWRITE, ncfile)
       call nc_check(ret, 'read_transpose_single_task: opening', netcdf_filename)
    endif
@@ -266,7 +266,7 @@
 
    ! open netcdf file
    if (query_write_copy(copy)) then
-      netcdf_filename_out = get_output_file(name_handle, copy, domain)
+      netcdf_filename_out = get_restart_filename(name_handle, copy, domain)
 
       if(file_exist(netcdf_filename_out)) then
          ret = nf90_open(netcdf_filename_out, NF90_WRITE, ncfile_out)
@@ -388,7 +388,7 @@
    if (is_reader) then
 
       if (query_read_copy(my_copy)) then
-         netcdf_filename = get_input_file(name_handle, my_copy, domain)
+         netcdf_filename = get_restart_filename(name_handle, my_copy, domain)
          !print*, 'opening netcdf_filename ', trim(netcdf_filename)
          ret = nf90_open(netcdf_filename, NF90_NOWRITE, ncfile)
          call nc_check(ret, 'read_transpose opening', netcdf_filename)
@@ -563,7 +563,7 @@
    ! writers open netcdf output file. This is a copy of the input file
    if (is_writer) then
       if ( query_write_copy(my_copy)) then
-         netcdf_filename_out = get_output_file(name_handle, my_copy, domain)
+         netcdf_filename_out = get_restart_filename(name_handle, my_copy, domain)
 
          if(file_exist(netcdf_filename_out)) then
             ret = nf90_open(netcdf_filename_out, NF90_WRITE, ncfile_out)
@@ -911,7 +911,7 @@
 
 character(len=NF90_MAX_NAME) :: filename
 
-filename = get_output_file(ens_name_handle, copy_number, dom_id)
+filename = get_restart_filename(ens_name_handle, copy_number, dom_id)
 
 write(msgstring,*) 'Creating output file ', trim(filename)
 call error_handler(E_ALLMSG,'create_and_open_state_output:', msgstring)

Modified: DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-18 15:50:53 UTC (rev 10763)
+++ DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-18 16:03:39 UTC (rev 10764)
@@ -74,8 +74,7 @@
           assert_restart_names_initialized
 
 ! Accessor functions:
-public :: get_input_file, &
-          get_output_file, &
+public :: get_restart_filename, &
           get_single_file, &
           get_file_description, &
           get_restart_files
@@ -763,37 +762,20 @@
 !> Return the appropriate input file for copy and domain