[Dart-dev] DART/branches Revision: 11751

[dart at ucar.edu]

hendric at ucar.edu
2017-06-21 10:37:08 -0600 (Wed, 21 Jun 2017)
42

updating comments and print statements.




Modified: DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-20 23:20:31 UTC (rev 11750)
+++ DART/branches/rma_mmc/models/model_mod_tools/model_mod_check.f90	2017-06-21 16:37:08 UTC (rev 11751)
@@ -128,7 +128,7 @@
 logical :: cartesian = .false.
 
 ! error handler strings
-character(len=512) :: string1
+character(len=512) :: string1, my_base, my_desc
 
 !----------------------------------------------------------------------
 ! This portion checks the geometry information.
@@ -167,12 +167,14 @@
 model_size = get_model_size()
 
 if ( do_output() ) then 
-   write(*,*)
+   write(*,'(A)') '-------------------------------------------------------------'
    write(*,'(''state vector has length'',i10)') model_size
-   write(*,*)
+   write(*,'(A)') '-------------------------------------------------------------'
 endif
 
 call print_test_message('FINISHED TEST 1')
+write(*,'(A)') ''
+write(*,'(A)') ''
 
 if ( test1thru == 1 ) call exit(0)
 
@@ -185,8 +187,6 @@
 
 model_time  = set_time(21600, 149446)   ! 06Z 4 March 2010
 
-print*, 'ens_size : ', num_ens, input_restart_list(1:num_ens)
-
 ! Set up the ensemble storage and read in the restart file
 call init_ensemble_manager(ens_handle, num_ens, model_size)
 
@@ -197,33 +197,41 @@
                        single_file  = .false., & 
                        restart_list = input_restart_list)
 
-call set_file_metadata(file_info_input,                          &
-                       cnum     = 1,                             &
-                       fnames   = input_restart_list(1:num_ens), &
-                       basename = 'ens',                         &
-                       desc     = 'resetart file')
+do imem = 1, num_ens
+   write(my_base,'(A,I2)') 'inens_',    imem
+   write(my_desc,'(A,I2)') 'input ens', imem
+   call set_file_metadata(file_info_input,                          &
+                          cnum     = imem,                          &
+                          fnames   = (/input_restart_list(imem)/),  &
+                          basename = my_base,                       &
+                          desc     = my_desc)
+   
+   call set_io_copy_flag(file_info_input, &
+                         cnum    = imem,     &
+                         io_flag = READ_COPY)
+enddo
 
-call set_io_copy_flag(file_info_input, &
-                      cnum    = 1,     &
-                      io_flag = READ_COPY)
-
 ! Initialize output file info
 call io_filenames_init(file_info_output,       &
                        num_copies   = num_ens, &
                        cycling      = .false., &
                        single_file  = .false., &
                        restart_list = output_restart_list)
+      
+do imem = 1, num_ens
+   write(my_base,'(A,I2)') 'outens_',    imem
+   write(my_desc,'(A,I2)') 'output ens', imem
+   call set_file_metadata(file_info_output,                          & 
+                          cnum     = imem,                           &
+                          fnames   = (/output_restart_list(imem)/),  &
+                          basename = my_base,                        &
+                          desc     = my_desc)
+   
+   call set_io_copy_flag(file_info_output,    &
+                         cnum    = imem,      &
+                         io_flag = WRITE_COPY)  
+enddo
 
-call set_file_metadata(file_info_output,                          & 
-                       cnum     = 1,                              &
-                       fnames   = output_restart_list(1:num_ens), &
-                       basename = 'ens',                          &
-                       desc     = 'resetart file')
-
-call set_io_copy_flag(file_info_output, &
-                      cnum    = 1,      &
-                      io_flag = WRITE_COPY)  
-
 !----------------------------------------------------------------------
 ! Open a test netcdf initial conditions file.
 !----------------------------------------------------------------------
@@ -231,27 +239,42 @@