[Dart-dev] DART/branches Revision: 11809

[dart at ucar.edu]

hendric at ucar.edu
2017-07-10 16:31:05 -0600 (Mon, 10 Jul 2017)
151

cleaning up some of the print statements.  Checking the name of the file list
inside filter to make sure that it contains the right amount of files.




Index: DART/branches/rma_file_list_nml
===================================================================
--- DART/branches/rma_file_list_nml	2017-07-07 21:11:42 UTC (rev 11808)
+++ DART/branches/rma_file_list_nml	2017-07-10 22:31:05 UTC (rev 11809)

Property changes on: DART/branches/rma_file_list_nml
___________________________________________________________________
Modified: svn:mergeinfo
## -32,7 +32,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
-/DART/branches/rma_trunk:11729-11790
+/DART/branches/rma_trunk:11729-11795
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.f90	2017-07-07 21:11:42 UTC (rev 11808)
+++ DART/branches/rma_file_list_nml/assimilation_code/modules/assimilation/filter_mod.f90	2017-07-10 22:31:05 UTC (rev 11809)
@@ -31,7 +31,7 @@
                                   logfileunit, nmlfileunit, timestamp,  &
                                   do_output, find_namelist_in_file, check_namelist_read,      &
                                   open_file, close_file, do_nml_file, do_nml_term, to_upper,  &
-                                  set_filename_list
+                                  set_filename_list, find_textfile_dims
 
 use assim_model_mod,       only : static_init_assim_model, get_model_size,                    &
                                   end_assim_model,  pert_model_copies
@@ -2385,8 +2385,7 @@
 type(file_info_type), intent(out) :: file_info_analysis
 type(file_info_type), intent(out) :: file_info_output
 
-integer :: noutput_members, next_file, nfiles, idom, i, tfiles
-logical :: has_multi_domains, multi_dom
+integer :: noutput_members, next_file, nfiles, tfiles, nlines, idom, i
 character(len=64)  :: fsource
 character(len=256) :: file_array_input(MAXFILES), file_array_output(MAXFILES)
 character(len=256) :: file_input(MAXFILES), file_output(MAXFILES)
@@ -2394,15 +2393,16 @@
 ! local variable to shorten the name for function input
 noutput_members = num_output_state_members 
 
+! file_array_{input,output} store a temporary array of files to 
+! be stored in the larger file_{input,output} when using multiple
+! domains.  This is so we can reuse set_filename_list, multiple times
 file_array_input (:) =  input_state_files(:)
 file_array_output(:) = output_state_files(:)
 
-!! check to see if mutiple domains when using text files for file input.
-!if(input_state_file_list(2) /= 'null' .or. input_state_file_list(2) /= '') then
-!   has_multi_domains = .false.
-!else
-!   has_multi_domains = .true.
-!endif
+! cummulative file list.  for each domain we expect the files in the
+! order ens1d01, ens2d01, ens3d03, and for domain 2 ens1d02, ens2d02, ens3d02,
+file_input (:) =  input_state_files(:)
+file_output(:) = output_state_files(:)
 
 if (file_array_input(1) == '' .and. input_state_file_list(1) == '') then
    call error_handler(E_ERR, 'initialize_file_information', source,revision,revdate,&
@@ -2418,27 +2418,24 @@
              text3='and a input_state_files_list containing a list of names')
 endif
 
-if (input_state_file_list(2) /= '' .and. get_num_domains() >= 2) then
-   fsource   = 'file list has multiple domains'
-   multi_dom = .true.
-else
-   fsource   = 'file list has single domain'
-   multi_dom = .false.
-endif
+! Check the dimensions input_state_file_list and output_state_file_list
+call check_file_list_dimensions(input_state_file_list, 'input_state_file_list')
+call check_file_list_dimensions(output_state_file_list, 'output_state_file_list')
 
-print*, 'Gsource :: ', fsource, MAX_NUM_DOMS
+!#! print*, 'fsource :: ', fsource, MAX_NUM_DOMS
+!#! 
+!#! print*, 'input_state_file_list :: "', trim(input_state_file_list(1)), '"'
+!#! print*, ''
+!#! print*, 'file_array_input(1) :: "', trim(file_array_input(1)), '"'
+!#! print*, 'file_array_input(2) :: "', trim(file_array_input(2)), '"'
+!#! print*, 'file_array_input(3) :: "', trim(file_array_input(3)), '"'
+!#! print*, 'file_array_input(4) :: "', trim(file_array_input(4)), '"'
 
-print*, 'input_state_file_list :: "', trim(input_state_file_list(1)), '"'
-print*, ''
-print*, 'file_array_input(1) :: "', trim(file_array_input(1)), '"'
-print*, 'file_array_input(2) :: "', trim(file_array_input(2)), '"'
-print*, 'file_array_input(3) :: "', trim(file_array_input(3)), '"'
-print*, 'file_array_input(4) :: "', trim(file_array_input(4)), '"'
-
-nfiles = 0
-tfiles = 1
+! set input files
+nfiles = 0 ! number of files from a text state_file_list
+tfiles = 1 ! cummulative sum of files (with multiple domains)
 do i = 1, get_num_domains()