[Dart-dev] DART/branches Revision: 10747

[dart at ucar.edu]

hendric at ucar.edu
2016-11-14 08:03:59 -0700 (Mon, 14 Nov 2016)
95
removing option to add domain extension.  This is no
longer needed since filenames are fixed.




Modified: DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-14 15:02:05 UTC (rev 10746)
+++ DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-14 15:03:59 UTC (rev 10747)
@@ -89,8 +89,6 @@
    private
    logical            :: initialized       = .false.
 
-   !>@todo FIXME JPH: do we need domain_extension anymore?
-   logical            :: domain_extension  = .false. ! add _d0X to filenames
    logical            :: pmo_run           = .false. ! for perfect model obs
 
    character(len=512) :: input_restart_list(10)  = 'null' ! list of input  restarts 1 file per domain
@@ -203,7 +201,7 @@
 !> have to change this namelist between running perfect_model_obs and
 !> filter.
 function io_filenames_init(ens_handle, single_restart_file_in,  single_restart_file_out, &
-             input_restart_list, output_restart_list, pmo_run, domain_extension, ) result(file_info)
+             input_restart_list, output_restart_list, pmo_run ) result(file_info)
 
 type(ensemble_type), intent(in) :: ens_handle
 logical,             intent(in) :: single_restart_file_in ! all copies read from one file
@@ -212,7 +210,6 @@
 character(len=*),   optional, intent(in) :: input_restart_list(10)  ! list of input restarts one for each domain
 character(len=*),   optional, intent(in) :: output_restart_list(10) ! list of output restarts one for each domain
 logical,            optional, intent(in) :: pmo_run
-logical,            optional, intent(in) :: domain_extension ! add _d0X to filenames
 type(file_info_type) :: file_info
 
 
@@ -230,8 +227,6 @@
    file_info%options%pmo_run = .false.
 endif
 
-if(present(domain_extension)) file_info%options%domain_extension = domain_extension
-
 ! loads up filenames and checks any existing files are the correct shape
 call set_filenames(ens_handle, file_info)
 
@@ -280,7 +275,7 @@
 do idom = 1, num_domains
 
    ! optional domain string
-   if (num_domains > 1 .or. file_info%options%domain_extension) then
+   if (num_domains > 1) then
       write(dom_str, '(A, i2.2)') '_d', idom 
    else
       write(dom_str, '(A)') ''
@@ -795,7 +790,7 @@
 character(len = 32) :: base_name
 character(len = 32) :: ext = ''
 
-if (get_num_domains() > 1 .or. file_info%options%domain_extension)then
+if (get_num_domains() > 1)then
    write(ext, '(A, i2.2)') '_d', domain
 endif
 
@@ -821,7 +816,7 @@
 character(len = 32) :: base_name
 character(len = 32) :: ext = ''
 
-if (get_num_domains() > 1 .or. file_info%options%domain_extension)then
+if (get_num_domains() > 1)then
    write(ext, '(A, i2.2)') '_d', domain
 endif